From 1b1d6ad9ec8808a4cce4e70bd0a250dbbdaad630 Mon Sep 17 00:00:00 2001 From: Joel Rudsberg Date: Wed, 4 Dec 2024 11:29:16 +0100 Subject: [PATCH] test will entire matrix --- .github/workflows/test.yml | 8 ++++---- __tests__/sbom/main-test-app/verify-sbom.cmd | 2 +- __tests__/sbom/main-test-app/verify-sbom.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ed8f18..d307c6d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -424,9 +424,9 @@ jobs: contents: write strategy: matrix: - java-version: ['24-ea'] + java-version: ['24-ea', 'latest-ea'] distribution: ['graalvm'] - os: [ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-latest] set-gds-token: [false] components: [''] steps: @@ -440,14 +440,14 @@ jobs: components: ${{ matrix.components }} gds-token: ${{ matrix.set-gds-token && secrets.GDS_TOKEN || '' }} native-image-enable-sbom: 'true' - - name: Build Maven project and verify SBOM was generated and its contents + - name: Build Maven project and verify that SBOM was generated and its contents run: | cd __tests__/sbom/main-test-app mvn -Pnative package bash verify-sbom.sh shell: bash if: runner.os != 'Windows' - - name: Build Maven project and verify SBOM was generated and its contents (Windows) + - name: Build Maven project and verify that SBOM was generated and its contents (Windows) run: | cd __tests__\sbom\main-test-app mvn -Pnative package diff --git a/__tests__/sbom/main-test-app/verify-sbom.cmd b/__tests__/sbom/main-test-app/verify-sbom.cmd index fa08935..88bd819 100644 --- a/__tests__/sbom/main-test-app/verify-sbom.cmd +++ b/__tests__/sbom/main-test-app/verify-sbom.cmd @@ -11,4 +11,4 @@ for %%p in ( findstr /c:%%p sbom.sbom.json || exit /b 1 ) -echo SBOM was successfully generated and contained the expected contents \ No newline at end of file +echo SBOM was successfully generated and contained the expected components \ No newline at end of file diff --git a/__tests__/sbom/main-test-app/verify-sbom.sh b/__tests__/sbom/main-test-app/verify-sbom.sh index aba0a15..a7bf08a 100644 --- a/__tests__/sbom/main-test-app/verify-sbom.sh +++ b/__tests__/sbom/main-test-app/verify-sbom.sh @@ -16,4 +16,4 @@ for pattern in "${required_patterns[@]}"; do fi done -echo "SBOM was successfully generated and contained the expected contents" \ No newline at end of file +echo "SBOM was successfully generated and contained the expected components" \ No newline at end of file