Skip to content

Commit cc0e995

Browse files
authored
Merge pull request #2671 from linux-on-ibm-z/main-travis-s390x
(maint) Add the s390x arch to build and test CI
2 parents 8a1a0c3 + 0575d9d commit cc0e995

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
language: clojure
22
lein: 2.9.10
33
dist: focal
4+
os: linux
45

56
script:
67
- ./ext/travisci/install-java.sh
78
- ./ext/travisci/test.sh
89
jobs:
10+
allow_failures:
11+
- arch: s390x
912
include:
1013
- name: "Java 17"
1114
env:
@@ -18,6 +21,20 @@ jobs:
1821
env:
1922
- JAVA_VERSION=17
2023
- MULTITHREADED=true
24+
- name: "Java 17 (s390x)"
25+
env:
26+
- JAVA_VERSION=17
27+
arch: s390x
28+
- name: "Java 17 w/ FIPS (s390x)"
29+
env:
30+
- JAVA_VERSION=17
31+
- ADDITIONAL_LEIN_ARGS="with-profile fips"
32+
arch: s390x
33+
- name: "Java 17 w/ multithreaded (s390x)"
34+
env:
35+
- JAVA_VERSION=17
36+
- MULTITHREADED=true
37+
arch: s390x
2138

2239
notifications:
2340
email: false

ext/travisci/install-java.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
set -e
44

5-
echo "Installing Java $JAVA_VERSION"
5+
6+
echo "Installing Java $JAVA_VERSION on arch $TRAVIS_CPU_ARCH"
67

78
sudo rm -rf /usr/local/lib/jvm/
89
sudo rm -rf /usr/lib/jvm/openjdk-$JAVA_VERSION
910
sudo apt-get update
1011
sudo apt-get install -y openjdk-$JAVA_VERSION-jdk-headless
11-
export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/
12+
export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-$TRAVIS_CPU_ARCH/

0 commit comments

Comments
 (0)