From c939d1f9c50b9ebb993761e88e9f73358d4f1786 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Oct 2020 11:02:28 +0200
Subject: Revert ".travis.yml: disable s390x target since Travis-CI infra is KO
 regarding this"

This reverts commit 11d2e04051001a38f45a27bac7167b483ee94650.

This is now stable again
---
 .travis.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 073d06e8..0091d31a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,13 +66,13 @@ 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_s390x
+        - DETAILS="linux, s390x"
 
     - os: osx
       env:
-- 
cgit v1.2.3


From 3feddc89cb7941851154d03d20b2bfa9f4a7ab65 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Oct 2020 11:05:51 +0200
Subject: .travis.yml: add a arm64 platform

---
 .travis.yml                            | 10 +++++++++-
 travis/linux_generic/after_success.sh  |  5 +++++
 travis/linux_generic/before_install.sh |  8 ++++++++
 travis/linux_generic/install.sh        |  9 +++++++++
 travis/linux_s390x/after_success.sh    |  5 -----
 travis/linux_s390x/before_install.sh   |  8 --------
 travis/linux_s390x/install.sh          |  9 ---------
 7 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100755 travis/linux_generic/after_success.sh
 create mode 100755 travis/linux_generic/before_install.sh
 create mode 100755 travis/linux_generic/install.sh
 delete mode 100755 travis/linux_s390x/after_success.sh
 delete mode 100755 travis/linux_s390x/before_install.sh
 delete mode 100755 travis/linux_s390x/install.sh

diff --git a/.travis.yml b/.travis.yml
index 0091d31a..dc5356ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -71,9 +71,17 @@ matrix:
       compiler: gcc
       arch: s390x
       env:
-        - BUILD_NAME=linux_s390x
+        - 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:
         - BUILD_NAME=osx
diff --git a/travis/linux_generic/after_success.sh b/travis/linux_generic/after_success.sh
new file mode 100755
index 00000000..9618f673
--- /dev/null
+++ b/travis/linux_generic/after_success.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+# nothing
diff --git a/travis/linux_generic/before_install.sh b/travis/linux_generic/before_install.sh
new file mode 100755
index 00000000..114d8a7f
--- /dev/null
+++ b/travis/linux_generic/before_install.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -e
+
+./travis/before_install_apt.sh
+./travis/before_install_pip.sh
+
+sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev zip
diff --git a/travis/linux_generic/install.sh b/travis/linux_generic/install.sh
new file mode 100755
index 00000000..f2db7e4b
--- /dev/null
+++ b/travis/linux_generic/install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+export CCACHE_CPP2=yes
+export PROJ_DB_CACHE_DIR="$HOME/.ccache"
+
+# -fno-use-cxa-atexit is needed to build with -coverage
+CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-Werror" CXXFLAGS="-Werror" ./travis/install.sh
diff --git a/travis/linux_s390x/after_success.sh b/travis/linux_s390x/after_success.sh
deleted file mode 100755
index 9618f673..00000000
--- a/travis/linux_s390x/after_success.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# nothing
diff --git a/travis/linux_s390x/before_install.sh b/travis/linux_s390x/before_install.sh
deleted file mode 100755
index 114d8a7f..00000000
--- a/travis/linux_s390x/before_install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./travis/before_install_apt.sh
-./travis/before_install_pip.sh
-
-sudo apt-get install -qq sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev zip
diff --git a/travis/linux_s390x/install.sh b/travis/linux_s390x/install.sh
deleted file mode 100755
index f2db7e4b..00000000
--- a/travis/linux_s390x/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-# -fno-use-cxa-atexit is needed to build with -coverage
-CC="ccache $CC" CXX="ccache $CXX" CFLAGS="-Werror" CXXFLAGS="-Werror" ./travis/install.sh
-- 
cgit v1.2.3