Skip to content

Commit 90a2349

Browse files
Packaging Integration Tests (#9106)
Refactor tests/integration/native-image into a more general "packaging" test suite.
1 parent 4d51871 commit 90a2349

File tree

113 files changed

+1955
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1955
-886
lines changed

.github/workflows/validate.yml

+73-12
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
cache: maven
135135
- uses: graalvm/setup-graalvm@v1
136136
with:
137-
java-version: 21
137+
java-version: '21'
138138
distribution: graalvm-community
139139
github-token: ${{ secrets.GITHUB_TOKEN }}
140140
native-image-job-reports: true
@@ -211,31 +211,92 @@ jobs:
211211
-f archetypes/pom.xml \
212212
install
213213
packaging:
214-
timeout-minutes: 60
214+
timeout-minutes: 30
215+
strategy:
216+
matrix:
217+
os: [ ubuntu-20.04, macos-14 ]
218+
packaging: [ jar, jlink ]
219+
include:
220+
- { os: ubuntu-20.04, platform: linux }
221+
- { os: macos-14, platform: macos }
222+
runs-on: ${{ matrix.os }}
223+
name: tests/packaging-${{ matrix.packaging }}-${{ matrix.platform }}
224+
steps:
225+
- uses: actions/checkout@v4
226+
with:
227+
ref: ${{ inputs.ref }}
228+
- name: Set up JDK ${{ env.JAVA_VERSION }}
229+
uses: actions/[email protected]
230+
with:
231+
distribution: ${{ env.JAVA_DISTRO }}
232+
java-version: ${{ env.JAVA_VERSION }}
233+
cache: maven
234+
- name: Free Space
235+
shell: bash
236+
run: |
237+
# See https://github.com/actions/runner-images/issues/2840
238+
sudo rm -rf /usr/share/dotnet
239+
sudo rm -rf /usr/local/share/powershell
240+
- name: Build Helidon
241+
run: |
242+
# prime build
243+
mvn ${MAVEN_ARGS} -e \
244+
-DskipTests \
245+
-Ptests \
246+
install
247+
- name: Run Test
248+
run: |
249+
mvn ${MAVEN_ARGS} \
250+
-f tests/integration/packaging/pom.xml \
251+
-P${{ matrix.packaging }}-image \
252+
verify
253+
native-image:
254+
timeout-minutes: 30
215255
strategy:
216256
matrix:
217-
os: [ ubuntu-20.04, macos-14]
257+
os: [ ubuntu-20.04, macos-14 ]
258+
module: [ mp-1, mp-2, mp-3, se-1 ]
259+
include:
260+
- { os: ubuntu-20.04, platform: linux }
261+
- { os: macos-14, platform: macos }
218262
runs-on: ${{ matrix.os }}
263+
name: tests/native-image-${{ matrix.module }}-${{ matrix.platform }}
219264
steps:
220265
- uses: actions/checkout@v4
266+
with:
267+
ref: ${{ inputs.ref }}
221268
- uses: graalvm/setup-graalvm@v1
222269
with:
223-
java-version: 21
270+
java-version: ${{ env.JAVA_VERSION }}
224271
distribution: graalvm-community
225272
github-token: ${{ secrets.GITHUB_TOKEN }}
226273
native-image-job-reports: true
227274
cache: maven
275+
- name: Free Space
276+
shell: bash
277+
run: |
278+
# See https://github.com/actions/runner-images/issues/2840
279+
sudo rm -rf /usr/share/dotnet
280+
sudo rm -rf /usr/local/share/powershell
228281
- name: Build Helidon
229282
run: |
230283
# prime build
231284
mvn ${MAVEN_ARGS} -e \
232-
-Dmaven.test.skip=true \
233285
-DskipTests \
234-
-Ppipeline \
286+
-Ptests \
235287
install
236-
- name: JAR packaging
237-
run: etc/scripts/test-packaging-jar.sh
238-
- name: JLink packaging
239-
run: etc/scripts/test-packaging-jlink.sh
240-
- name: Native-Image packaging
241-
run: etc/scripts/test-packaging-native.sh
288+
- name: Run Test
289+
run: |
290+
mvn ${MAVEN_ARGS} -e \
291+
-f tests/integration/packaging/pom.xml \
292+
-pl ${{ matrix.module }} \
293+
-Pnative-image \
294+
-am \
295+
verify
296+
gate:
297+
runs-on: ubuntu-20.04
298+
needs: [ copyright, checkstyle, shellcheck, build, docs, spotbugs, packaging, native-image, archetypes, mp-tck ]
299+
steps:
300+
- shell: bash
301+
run: |
302+
echo OK

etc/scripts/test-packaging-jar.sh

-75
This file was deleted.

etc/scripts/test-packaging-jlink.sh

-85
This file was deleted.

etc/scripts/test-packaging-native.sh

-82
This file was deleted.

tests/integration/native-image/mp-1/README.md

-40
This file was deleted.

0 commit comments

Comments
 (0)