ci: use ubuntu 18.04 for builds

JaCzekanski · Aug 17, 2019 · 92cfe5c · 92cfe5c
1 parent 7dc0c85
commit 92cfe5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,14 +7,17 @@ matrix:
   include:
   - name: Linux Clang6
     os: linux
+    dist: bionic
     services: docker
     script: "./.travis/linux/run-container.sh 6"
   - name: Linux Clang8
     os: linux
+    dist: bionic
     services: docker
     script: "./.travis/linux/run-container.sh 8"
   - name: Android
     os: linux
+    dist: bionic
     services: docker
     before_install: openssl aes-256-cbc -K $encrypted_7333c7dd5b15_key -iv $encrypted_7333c7dd5b15_iv -in android/avocado.keystore.enc -out android/avocado.keystore -d
     script: "./.travis/android/run-container.sh"

diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh
@@ -7,8 +7,8 @@ export OS=linux64
 export DATE=`date +%Y%m%d`
 export COMMIT=`git rev-parse --short=7 HEAD`
 export ARTIFACT=avocado-$OS-$DATE-$COMMIT
-export CC="ccache clang-6.0 -fcolor-diagnostics"
+export CC="ccache cc -fcolor-diagnostics"
-export CXX="ccache clang++-6.0 -fcolor-diagnostics"
+export CXX="ccache c++ -fcolor-diagnostics"
 
 # Configure cache
 ccache --set-config=sloppiness=pch_defines,time_macros