aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2020-09-25 09:04:18 -0400
committerJack Lloyd <[email protected]>2020-09-25 09:04:18 -0400
commit390aab76e0d60a667254c20100c2d4da78c1ceb1 (patch)
treebd419ad34066eedee23bbb31d04dcbfa04722ca2 /src
parent7b63877d1ce74bfdb28549f72fbba740fc76d32c (diff)
parent62f3fd73ee0e0fb1be3d0d0846bf5956e427735d (diff)
Merge GH #2405 Update Travis configuration
Diffstat (limited to 'src')
-rw-r--r--src/scripts/ci/travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/scripts/ci/travis.yml b/src/scripts/ci/travis.yml
index 8bf919ebe..2b3b009dd 100644
--- a/src/scripts/ci/travis.yml
+++ b/src/scripts/ci/travis.yml
@@ -45,13 +45,13 @@ jobs:
env:
- TARGET="valgrind"
-# - os: linux
-# dist: bionic
-# name: Linux s390x
-# arch: s390x
-# compiler: gcc
-# env:
-# - TARGET="shared"
+ - os: linux
+ dist: bionic
+ name: Linux s390x
+ arch: s390x
+ compiler: gcc
+ env:
+ - TARGET="shared"
- os: linux
dist: bionic
@@ -97,7 +97,7 @@ jobs:
compiler: clang
env:
- TARGET="cross-android-arm32"
- - ANDROID_NDK=android-ndk-r20
+ - ANDROID_NDK=android-ndk-r21d
- os: linux
dist: bionic
@@ -105,7 +105,7 @@ jobs:
compiler: clang
env:
- TARGET="cross-android-arm64"
- - ANDROID_NDK=android-ndk-r20
+ - ANDROID_NDK=android-ndk-r21d
- os: linux
dist: bionic