aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2020-07-28 16:04:20 +0200
committerMarcoFalke <[email protected]>2020-07-28 16:01:53 +0200
commitfae656144e9ec25a0b610cd5278c1b7c42880097 (patch)
treeb1d68318486978113a3e1c2c30edbcf1cd1cc738
parentMerge #19519: ci: Increase CCACHE_SIZE in some builds on Travis (diff)
downloaddiscoin-fae656144e9ec25a0b610cd5278c1b7c42880097.tar.xz
discoin-fae656144e9ec25a0b610cd5278c1b7c42880097.zip
travis: Re-enable s390x
-rw-r--r--.travis.yml14
1 files changed, 6 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 2d69ad7d2..f9932cfac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,14 +72,12 @@ jobs:
FILE_ENV="./ci/test/00_setup_env_arm.sh"
QEMU_USER_CMD=""
-# s390 build was disabled temporarily because of disk space issues on the Travis VM
-#
-# - stage: test
-# name: 'S390x [GOAL: install] [buster] [unit tests, functional tests]'
-# arch: s390x # Can disable QEMU_USER_CMD and run the tests natively without qemu
-# env: >-
-# FILE_ENV="./ci/test/00_setup_env_s390x.sh"
-# QEMU_USER_CMD=""
+ - stage: test
+ name: 'S390x [GOAL: install] [buster] [unit tests, functional tests]'
+ arch: s390x # Can disable QEMU_USER_CMD and run the tests natively without qemu
+ env: >-
+ FILE_ENV="./ci/test/00_setup_env_s390x.sh"
+ QEMU_USER_CMD=""
- stage: test
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no functional tests]'