From 20080ca0442ad1451d3db6e7ee35abbfb4f34902 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 4 Sep 2020 15:22:11 +0200 Subject: [PATCH 1/2] Reenable s390x on travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e0e7ccbac99a..352a70dd85afd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,8 +74,8 @@ jobs: arch: amd64 - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1 arch: arm64 - #- env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1 - # arch: s390x + - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1 + arch: s390x before_script: - ccache --version From 72c6c1afde0a431d4f8b950cc3cde07a74815774 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 4 Sep 2020 16:53:18 +0200 Subject: [PATCH 2/2] Enable s390x only in nightly build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 352a70dd85afd..dc2affa8996e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,6 +76,7 @@ jobs: arch: arm64 - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1 arch: s390x + if: type = cron before_script: - ccache --version