Skip to content

Commit 881d884

Browse files
authored
Merge pull request #340 from IBM/github-action
issue #335 - use openjdk in favor of zulu
2 parents 33665a4 + adc31e3 commit 881d884

2 files changed

Lines changed: 21 additions & 112 deletions

File tree

.github/workflows/build.yml

Lines changed: 21 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java: [ '1.8', '11.0.1' ]
13+
java: [ 'openjdk8', 'openjdk11' ]
14+
fail-fast: false
1415
steps:
1516
- uses: actions/checkout@v1
16-
- name: Set up JDK
17-
uses: actions/setup-java@v1
17+
- name: Set up OpenJDK
18+
uses: joschi/setup-jdk@v1
1819
with:
1920
java-version: ${{ matrix.java }}
2021
- name: Build tools
@@ -31,126 +32,43 @@ jobs:
3132
runs-on: ubuntu-latest
3233
strategy:
3334
matrix:
34-
java: [ '1.8', '11.0.1' ]
35+
java: [ 'openjdk8', 'openjdk11' ]
36+
fail-fast: false
3537
steps:
3638
- uses: actions/checkout@v1
37-
- name: Set up JDK
38-
uses: actions/setup-java@v1
39+
- name: Set up OpenJDK
40+
uses: joschi/setup-jdk@v1
3941
with:
4042
java-version: ${{ matrix.java }}
4143
- name: Build samples
42-
run: mvn -B install --file fhir-examples/pom.xml
44+
run: mvn -B install --file fhir-examples/pom.xml --no-transfer-progress
4345
- name: Build parent with tests
44-
run: mvn -B -T2C package --file fhir-parent/pom.xml
45-
e2e-java8:
46-
runs-on: ubuntu-latest
47-
steps:
48-
- name: Checkout
49-
uses: actions/checkout@v1
50-
- name: Download OpenJDK 8
51-
run: wget "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u232-b09_openj9-0.17.0/OpenJDK8U-jdk_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz"
52-
- name: Set up JDK
53-
uses: actions/setup-java@v1
54-
with:
55-
java-version: 8
56-
architecture: x64
57-
jdkFile: OpenJDK8U-jdk_x64_linux_openj9_8u232b09_openj9-0.17.0.tar.gz
58-
- name: Build samples
59-
run: mvn -B install --file fhir-examples/pom.xml
60-
- name: Build parent without tests
61-
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
62-
- name: Server Integration Tests
63-
env:
64-
LC_ALL: en_US.UTF-8
65-
run: |
66-
export WORKSPACE=${GITHUB_WORKSPACE}
67-
build/pre-integration-test.sh
68-
env
69-
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true
70-
build/post-integration-test.sh
71-
- name: Gather error logs
72-
if: failure()
73-
run: |
74-
it_results=SIT/integration-test-results
75-
rm -fr ${it_results} 2>/dev/null
76-
mkdir -p ${it_results}/server-logs
77-
mkdir -p ${it_results}/fhir-server-test
78-
echo "Gathering post-test server logs..."
79-
cp -pr SIT/wlp/usr/servers/fhir-server/logs ${it_results}/server-logs
80-
echo "Gathering integration test output"
81-
cp -pr ${GITHUB_WORKSPACE}/fhir-server-test/target/surefire-reports/* ${it_results}/fhir-server-test
82-
- name: Upload logs
83-
if: always()
84-
uses: actions/upload-artifact@master
85-
with:
86-
name: integration-test-results-java8
87-
path: SIT/integration-test-results
88-
e2e-java11:
89-
runs-on: ubuntu-latest
90-
steps:
91-
- name: Checkout
92-
uses: actions/checkout@v1
93-
- name: Download OpenJDK 11
94-
run: wget "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk11u-2019-10-16-10-43/OpenJDK11U-jdk_x64_linux_openj9_2019-10-16-10-43.tar.gz"
95-
- name: Set up JDK
96-
uses: actions/setup-java@v1
97-
with:
98-
java-version: 11
99-
architecture: x64
100-
jdkFile: OpenJDK11U-jdk_x64_linux_openj9_2019-10-16-10-43.tar.gz
101-
- name: Build samples
102-
run: mvn -B install --file fhir-examples/pom.xml
103-
- name: Build parent without tests
104-
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
105-
- name: Server Integration Tests
106-
env:
107-
LC_ALL: en_US.UTF-8
108-
run: |
109-
export WORKSPACE=${GITHUB_WORKSPACE}
110-
build/pre-integration-test.sh
111-
env
112-
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true
113-
build/post-integration-test.sh
114-
- name: Gather error logs
115-
if: failure()
116-
run: |
117-
it_results=SIT/integration-test-results
118-
rm -fr ${it_results} 2>/dev/null
119-
mkdir -p ${it_results}/server-logs
120-
mkdir -p ${it_results}/fhir-server-test
121-
mkdir -p ${it_results}/derby
122-
echo "Gathering post-test server logs..."
123-
cp -pr SIT/wlp/usr/servers/fhir-server/logs ${it_results}/server-logs
124-
echo "Gathering post-test derby..."
125-
cp -pr SIT/wlp/usr/servers/fhir-server/derby ${it_results}/derby
126-
echo "Gathering integration test output"
127-
cp -pr ${GITHUB_WORKSPACE}/fhir-server-test/target/surefire-reports/* ${it_results}/fhir-server-test
128-
- name: Upload logs
129-
if: always()
130-
uses: actions/upload-artifact@master
131-
with:
132-
name: integration-test-results-java11
133-
path: SIT/integration-test-results
46+
run: mvn -B -T2C package --file fhir-parent/pom.xml --no-transfer-progress
13447
e2e-tests:
13548
runs-on: ubuntu-latest
13649
strategy:
13750
matrix:
138-
java: [ '11.0.1', '1.8' ]
51+
java: [ 'openjdk8', 'openjdk11' ]
52+
fail-fast: false
13953
steps:
14054
- uses: actions/checkout@v1
141-
- name: Set up JDK
142-
uses: actions/setup-java@v1
55+
- name: Set up OpenJDK
56+
uses: joschi/setup-jdk@v1
14357
with:
14458
java-version: ${{ matrix.java }}
14559
- name: Build samples
146-
run: mvn -B install --file fhir-examples/pom.xml
60+
run: mvn -B install --file fhir-examples/pom.xml --no-transfer-progress
14761
- name: Build parent without tests
148-
run: mvn -B install --file fhir-parent/pom.xml -DskipTests
62+
run: mvn -B install --file fhir-parent/pom.xml -DskipTests --no-transfer-progress
14963
- name: Server Integration Tests
64+
env:
65+
# debian-based linux uses C.UTF-8 by default and Derby doesn't like that
66+
LC_ALL: en_US.UTF-8
15067
run: |
15168
export WORKSPACE=${GITHUB_WORKSPACE}
15269
build/pre-integration-test.sh
153-
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true
70+
env
71+
mvn -B test -DskipTests=false -f fhir-server-test/pom.xml -DskipWebSocketTest=true --no-transfer-progress
15472
build/post-integration-test.sh
15573
- name: Gather error logs
15674
if: failure()

fhir-parent/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -876,14 +876,5 @@
876876
</repository>
877877
</distributionManagement>
878878
</profile>
879-
<profile>
880-
<id>switch-jdk-11</id>
881-
<activation>
882-
<jdk>!1.8</jdk>
883-
</activation>
884-
<properties>
885-
<java.version>11</java.version>
886-
</properties>
887-
</profile>
888879
</profiles>
889880
</project>

0 commit comments

Comments
 (0)