generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to trusty distro, remove 3rd-party PPAs for testing

Browse Source
This commit is contained in:
Brent Cook 2016-11-13 13:06:28 -06:00
parent c4165cc210
commit a638d7937d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -10,15 +10,23 @@ matrix:
- compiler: clang - compiler: clang
os: linux os: linux
env: ARCH=native env: ARCH=native
dist: trusty
sudo: required
- compiler: gcc - compiler: gcc
os: linux os: linux
env: ARCH=native env: ARCH=native
dist: trusty
sudo: required
- compiler: gcc - compiler: gcc
os: linux os: linux
env: ARCH=mingw32 env: ARCH=mingw32
dist: trusty
sudo: required
- compiler: gcc - compiler: gcc
os: linux os: linux
env: ARCH=mingw64 env: ARCH=mingw64
dist: trusty
sudo: required
script: script:
"./scripts/travis" "./scripts/travis"

7
scripts/travis
View File

@ -21,9 +21,6 @@ if [ "x$ARCH" = "xnative" ]; then
make make
make test make test
else else
sudo apt-get update
sudo apt-get install -y python-software-properties
sudo apt-add-repository -y ppa:kalakris/cmake
sudo apt-get update sudo apt-get update
sudo apt-get install -y cmake ninja-build sudo apt-get install -y cmake ninja-build
cmake -GNinja .. cmake -GNinja ..
@ -38,10 +35,6 @@ else
export CC=$CPU-w64-mingw32-gcc export CC=$CPU-w64-mingw32-gcc
if [ -z $(which $CC) ]; then if [ -z $(which $CC) ]; then
# Update Ubuntu 12.04 with current mingw toolchain
sudo apt-get update
sudo apt-get install -y python-software-properties
sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
sudo apt-get update sudo apt-get update
sudo apt-get install -y $ARCH-x-gcc make sudo apt-get install -y $ARCH-x-gcc make
export PATH=$PATH:/opt/$ARCH/bin export PATH=$PATH:/opt/$ARCH/bin