Skip to content

Commit 92cfe5c

Browse files
committed
ci: use ubuntu 18.04 for builds
1 parent 7dc0c85 commit 92cfe5c

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,17 @@ matrix:
77
include:
88
- name: Linux Clang6
99
os: linux
10+
dist: bionic
1011
services: docker
1112
script: "./.travis/linux/run-container.sh 6"
1213
- name: Linux Clang8
1314
os: linux
15+
dist: bionic
1416
services: docker
1517
script: "./.travis/linux/run-container.sh 8"
1618
- name: Android
1719
os: linux
20+
dist: bionic
1821
services: docker
1922
before_install: openssl aes-256-cbc -K $encrypted_7333c7dd5b15_key -iv $encrypted_7333c7dd5b15_iv -in android/avocado.keystore.enc -out android/avocado.keystore -d
2023
script: "./.travis/android/run-container.sh"

.travis/linux/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export OS=linux64
77
export DATE=`date +%Y%m%d`
88
export COMMIT=`git rev-parse --short=7 HEAD`
99
export ARTIFACT=avocado-$OS-$DATE-$COMMIT
10-
export CC="ccache clang-6.0 -fcolor-diagnostics"
11-
export CXX="ccache clang++-6.0 -fcolor-diagnostics"
10+
export CC="ccache cc -fcolor-diagnostics"
11+
export CXX="ccache c++ -fcolor-diagnostics"
1212

1313
# Configure cache
1414
ccache --set-config=sloppiness=pch_defines,time_macros

0 commit comments

Comments
 (0)