diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-10-20 12:12:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 12:12:29 +0200 |
| commit | 5180f5ceb3345b279f36d4c14207dcfd278ea1c8 (patch) | |
| tree | 6aefabf9c2e03da494cd3311d4a79129744f007f | |
| parent | 084f5f6cb39b3732c4cd930ebffcff86cdb24932 (diff) | |
| parent | 3feddc89cb7941851154d03d20b2bfa9f4a7ab65 (diff) | |
| download | PROJ-5180f5ceb3345b279f36d4c14207dcfd278ea1c8.tar.gz PROJ-5180f5ceb3345b279f36d4c14207dcfd278ea1c8.zip | |
Merge pull request #2363 from rouault/reactivate_s390x
.travis.yml: re-enable s390x and add arm64
| -rw-r--r-- | .travis.yml | 22 | ||||
| -rwxr-xr-x | travis/linux_generic/after_success.sh (renamed from travis/linux_s390x/after_success.sh) | 0 | ||||
| -rwxr-xr-x | travis/linux_generic/before_install.sh (renamed from travis/linux_s390x/before_install.sh) | 0 | ||||
| -rwxr-xr-x | travis/linux_generic/install.sh (renamed from travis/linux_s390x/install.sh) | 0 |
4 files changed, 15 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 073d06e8..dc5356ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,13 +66,21 @@ matrix: - BUILD_NAME=linux_clang - DETAILS="linux, clang" -# - os: linux -# dist: bionic -# compiler: gcc -# arch: s390x -# env: -# - BUILD_NAME=linux_s390x -# - DETAILS="linux, s390x" + - os: linux + dist: bionic + compiler: gcc + arch: s390x + env: + - BUILD_NAME=linux_generic + - DETAILS="linux, s390x" + + - os: linux + dist: bionic + compiler: gcc + arch: arm64 + env: + - BUILD_NAME=linux_generic + - DETAILS="linux, arm64" - os: osx env: diff --git a/travis/linux_s390x/after_success.sh b/travis/linux_generic/after_success.sh index 9618f673..9618f673 100755 --- a/travis/linux_s390x/after_success.sh +++ b/travis/linux_generic/after_success.sh diff --git a/travis/linux_s390x/before_install.sh b/travis/linux_generic/before_install.sh index 114d8a7f..114d8a7f 100755 --- a/travis/linux_s390x/before_install.sh +++ b/travis/linux_generic/before_install.sh diff --git a/travis/linux_s390x/install.sh b/travis/linux_generic/install.sh index f2db7e4b..f2db7e4b 100755 --- a/travis/linux_s390x/install.sh +++ b/travis/linux_generic/install.sh |