diff options
| author | Jack Lloyd <[email protected]> | 2020-09-27 11:59:51 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2020-09-27 11:59:51 -0400 |
| commit | b048c4ad33789e2249e1b6a4ecfe25551404b3af (patch) | |
| tree | eba05d1d83898b756af505677db7818db1df474b /src/scripts | |
| parent | 35f85ae50f4c47b9fbc7be5387ec6e92ac2f9a38 (diff) | |
| parent | 606b8e5b59f99f9597f00a0856142bbaaa885554 (diff) | |
Merge GH #2407 Move most CI builds to Ubuntu 20.04 image
Diffstat (limited to 'src/scripts')
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 2 | ||||
| -rw-r--r-- | src/scripts/ci/travis.yml | 38 |
2 files changed, 19 insertions, 21 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index 6bc53594d..f9b7513ab 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -83,7 +83,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then elif [ "$TARGET" = "docs" ]; then sudo apt-get -qq update - sudo apt-get install doxygen python-docutils python-sphinx + sudo apt-get install doxygen python-docutils python3-sphinx fi elif [ "$TRAVIS_OS_NAME" = "osx" ]; then diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml index b8dcc30fa..d61fd102b 100644 --- a/src/scripts/ci/travis.yml +++ b/src/scripts/ci/travis.yml @@ -1,7 +1,5 @@ language: cpp -sudo: required - env: global: - CCACHE_MAXSIZE=1536M @@ -10,14 +8,14 @@ env: jobs: include: - os: linux - dist: bionic + dist: focal name: Linux/GCC compiler: gcc env: - TARGET="shared" - os: linux - dist: bionic + dist: focal name: Linux/Clang compiler: clang env: @@ -31,7 +29,7 @@ jobs: - TARGET="coverage" - os: linux - dist: bionic + dist: focal arch: arm64 name: Fuzzers compiler: gcc @@ -39,14 +37,14 @@ jobs: - TARGET="fuzzers" - os: linux - dist: bionic + dist: focal name: Valgrind compiler: gcc env: - TARGET="valgrind" - os: linux - dist: bionic + dist: focal name: Linux s390x arch: s390x compiler: gcc @@ -54,7 +52,7 @@ jobs: - TARGET="shared" - os: linux - dist: bionic + dist: focal name: Linux arm64 arch: arm64 compiler: gcc @@ -62,7 +60,7 @@ jobs: - TARGET="shared" - os: linux - dist: bionic + dist: focal name: Linux ppc64le arch: ppc64le compiler: gcc @@ -70,7 +68,7 @@ jobs: - TARGET="shared" - os: linux - dist: bionic + dist: focal name: Linux i386 cross compiler: gcc env: @@ -92,7 +90,7 @@ jobs: - TARGET="cross-arm32" - os: linux - dist: bionic + dist: focal name: Android arm32 cross compiler: clang env: @@ -100,7 +98,7 @@ jobs: - ANDROID_NDK=android-ndk-r21d - os: linux - dist: bionic + dist: focal name: Android arm64 cross compiler: clang env: @@ -108,7 +106,7 @@ jobs: - ANDROID_NDK=android-ndk-r21d - os: linux - dist: bionic + dist: focal name: MinGW x86-64 cross compiler: gcc env: @@ -135,7 +133,7 @@ jobs: - EXTRA_FLAGS="--disable-werror" - os: linux - dist: bionic + dist: focal name: Linux Clang 8 compiler: clang env: @@ -143,14 +141,14 @@ jobs: - CXX="/usr/bin/clang++-8" - os: linux - dist: bionic + dist: focal name: Minimized compiler: gcc env: - TARGET="mini-shared" - os: linux - dist: bionic + dist: focal arch: arm64 name: Baremetal compiler: gcc @@ -158,28 +156,28 @@ jobs: - TARGET="baremetal" - os: linux - dist: bionic + dist: focal name: BSI policy compiler: gcc env: - TARGET="bsi" - os: linux - dist: bionic + dist: focal name: NIST policy compiler: gcc env: - TARGET="nist" - os: linux - dist: bionic + dist: focal name: Pylint compiler: gcc env: - TARGET="lint" - os: linux - dist: bionic + dist: focal name: Documentation compiler: gcc env: |