From 92cfe5cd0773794410b8a01cd19859d22dd9e9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Czeka=C5=84ski?= Date: Sat, 17 Aug 2019 17:13:59 +0200 Subject: [PATCH] ci: use ubuntu 18.04 for builds --- .travis.yml | 3 +++ .travis/linux/build.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b69af4fe..97e6baf8 100644 --- 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 index fd132ecb..725a02a2 100755 --- 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 CXX="ccache clang++-6.0 -fcolor-diagnostics" +export CC="ccache cc -fcolor-diagnostics" +export CXX="ccache c++ -fcolor-diagnostics" # Configure cache ccache --set-config=sloppiness=pch_defines,time_macros