From 958a6e6ee396d80cd76bb78c916dbb83860fd92d Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Mon, 20 Jan 2025 14:59:06 +0000 Subject: [PATCH 01/12] Linux arm tests Signed-off-by: Prabhu Subramanian --- .github/workflows/dockertests.yml | 6 +++--- .github/workflows/lint.yml | 2 +- .github/workflows/nodejs.yml | 2 +- .github/workflows/python-atom-tests.yml | 2 +- .github/workflows/repotests.yml | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index 7167c3f83..e76ee9b65 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-latest] + os: ['ubuntu-24.04', 'ubuntu-24.04-arm'] node-version: ['23.x'] java-version: ['23'] runs-on: ${{ matrix.os }} @@ -85,7 +85,7 @@ jobs: linux-dockertar-tests: strategy: matrix: - os: [ubuntu-latest] + os: ['ubuntu-24.04', 'ubuntu-24.04-arm'] node-version: ['23.x'] java-version: ['23'] runs-on: ${{ matrix.os }} @@ -134,7 +134,7 @@ jobs: env: CDXGEN_DEBUG_MODE: debug os-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9e2f96e5b..5ee5a3aa2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,7 +10,7 @@ on: pull_request: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 4e7bf2622..f589245d0 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: contents: read strategy: diff --git a/.github/workflows/python-atom-tests.yml b/.github/workflows/python-atom-tests.yml index 48ae473d0..e7b6b1b3b 100644 --- a/.github/workflows/python-atom-tests.yml +++ b/.github/workflows/python-atom-tests.yml @@ -8,7 +8,7 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: matrix: node-version: ['23.x'] diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 6f6016a67..fff70e7a8 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -15,7 +15,7 @@ jobs: fail-fast: true matrix: node-version: ['23.x'] - os: ['ubuntu-latest', 'windows-latest'] + os: ['ubuntu-24.04', 'ubuntu-24.04-arm', 'windows-latest'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -33,13 +33,13 @@ jobs: deno-version: v2.x - uses: oven-sh/setup-bun@v1 - name: Trim CI agent - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' run: | chmod +x contrib/free_disk_space.sh ./contrib/free_disk_space.sh - uses: sbt/setup-sbt@v1 - name: Install bazelisk - linux - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' run: | curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64" sudo mv bazelisk-linux-amd64 /usr/local/bin/bazel @@ -62,7 +62,7 @@ jobs: uses: android-actions/setup-android@v3 if: matrix.os != 'self-hosted' - uses: swift-actions/setup-swift@v2 - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' - name: Set up Python uses: actions/setup-python@v5 with: @@ -607,7 +607,7 @@ jobs: continue-on-error: true shell: bash - uses: actions/upload-artifact@v4 - if: github.ref == 'refs/heads/master' && matrix.os == 'ubuntu-latest' + if: github.ref == 'refs/heads/master' && (matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm') with: name: bomresults path: bomresults From 91b42b9ca42b49ce4d10703c6b2bf08fa1a478a2 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 22:42:23 +0000 Subject: [PATCH 02/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index fff70e7a8..55d4f7656 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -39,11 +39,17 @@ jobs: ./contrib/free_disk_space.sh - uses: sbt/setup-sbt@v1 - name: Install bazelisk - linux - if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' + if: matrix.os == 'ubuntu-24.04' run: | curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-amd64" sudo mv bazelisk-linux-amd64 /usr/local/bin/bazel chmod +x /usr/local/bin/bazel + - name: Install bazelisk - linux arm + if: matrix.os == 'ubuntu-24.04-arm' + run: | + curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-arm64" + sudo mv bazelisk-linux-arm64 /usr/local/bin/bazel + chmod +x /usr/local/bin/bazel - name: Install bazelisk - windows if: matrix.os == 'windows-latest' run: choco install -y bazel @@ -324,7 +330,7 @@ jobs: bin/cdxgen.js -p -t java -exclude-type js repotests/java-sec-code -o bomresults/bom-java-sec-code-10.json shell: bash - name: repotests greyhound - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-24.04' run: | bin/cdxgen.js -p -r -t java11 repotests/greyhound -o bomresults/bom-greyhound-java.json bin/cdxgen.js -p -r -t gradle repotests/greyhound -o bomresults/bom-greyhound-gradle.json @@ -607,7 +613,7 @@ jobs: continue-on-error: true shell: bash - uses: actions/upload-artifact@v4 - if: github.ref == 'refs/heads/master' && (matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm') + if: github.ref == 'refs/heads/master' && matrix.os == 'ubuntu-24.04-arm' with: name: bomresults path: bomresults From 15f5b224b48d158f8db4f1829387e126f4d67868 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 22:48:22 +0000 Subject: [PATCH 03/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 55d4f7656..f38878dba 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -66,7 +66,10 @@ jobs: CDXGEN_TEMP_DIR: ${{ runner.temp }}/cdxgen-repotests - name: Setup Android SDK uses: android-actions/setup-android@v3 - if: matrix.os != 'self-hosted' + with: + packages: 'platform-tools' + - run: sdkmanager --uninstall "build-tools;30.0.3" + - run: sdkmanager tools - uses: swift-actions/setup-swift@v2 if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' - name: Set up Python From 0a937b03068b9aa081f5fd73bdd67e312efc31ff Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 23:02:11 +0000 Subject: [PATCH 04/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/dockertests.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index e76ee9b65..8f81ecb1e 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -51,6 +51,7 @@ jobs: repository: 'grafana-operator/grafana-operator' path: 'repotests/grafana-operator' - name: dockertests + if: matrix.os == 'ubuntu-24.04' run: | bin/cdxgen.js ubuntu:latest -t docker -o bomresults/bom-ubuntu.json --fail-on-error docker rmi ubuntu:latest @@ -82,6 +83,23 @@ jobs: ls -ltr bomresults env: CDXGEN_DEBUG_MODE: debug + - name: dockertests arm + if: matrix.os == 'ubuntu-24.04-arm' + run: | + bin/cdxgen.js ubuntu:latest -t docker -o bomresults/bom-ubuntu.json --fail-on-error + docker rmi ubuntu:latest + bin/cdxgen.js alpine:latest -t docker -o bomresults/bom-alpine.json --fail-on-error + docker rmi alpine:latest + bin/cdxgen.js almalinux:9.4-minimal -t docker -o bomresults/bom-almalinux.json --fail-on-error + docker rmi almalinux:9.4-minimal + bin/cdxgen.js centos:latest -t oci -o bomresults/bom-centos.json --fail-on-error + docker rmi centos:latest + bin/cdxgen.js -t docker-compose test/data -o bomresults/bom-dc.json --fail-on-error + bin/cdxgen.js -t operator repotests/grafana-operator -o bomresults/bom-op.json --fail-on-error + rm /tmp/scanslim.tar + ls -ltr bomresults + env: + CDXGEN_DEBUG_MODE: debug linux-dockertar-tests: strategy: matrix: @@ -121,6 +139,7 @@ jobs: repository: 'grafana-operator/grafana-operator' path: 'repotests/grafana-operator' - name: dockertests + if: matrix.os == 'ubuntu-24.04' run: | docker pull elasticsearch@sha256:3686a5757ed46c9dbcf00f6f71fce48ffc5413b193a80d1c46a21e7aad4c53ad docker save -o /tmp/elastic.tar elasticsearch@sha256:3686a5757ed46c9dbcf00f6f71fce48ffc5413b193a80d1c46a21e7aad4c53ad @@ -134,7 +153,7 @@ jobs: env: CDXGEN_DEBUG_MODE: debug os-tests: - runs-on: ubuntu-24.04 + runs-on: [ubuntu-24.04, ubuntu-24.04-arm] strategy: matrix: @@ -172,6 +191,7 @@ jobs: env: CDXGEN_DEBUG_MODE: debug - uses: actions/upload-artifact@v4 + if: matrix.os == 'ubuntu-24.04-arm' with: name: bomresults-os path: bomresults From 9f0001c4acd90bba991ebb2d4013c532df4e8d78 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 23:07:37 +0000 Subject: [PATCH 05/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index f38878dba..b4693f43d 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -69,7 +69,6 @@ jobs: with: packages: 'platform-tools' - run: sdkmanager --uninstall "build-tools;30.0.3" - - run: sdkmanager tools - uses: swift-actions/setup-swift@v2 if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' - name: Set up Python From e68fc80130804dab7172ca3d3073dafeef787458 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 23:26:43 +0000 Subject: [PATCH 06/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index b4693f43d..7bd661f20 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -71,6 +71,8 @@ jobs: - run: sdkmanager --uninstall "build-tools;30.0.3" - uses: swift-actions/setup-swift@v2 if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' + with: + swift-version: 6.0.3 - name: Set up Python uses: actions/setup-python@v5 with: From 898ffd1e3d6d5b6b5261b2f83c080c970c037230 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 23:30:12 +0000 Subject: [PATCH 07/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 7bd661f20..58db22938 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -72,7 +72,7 @@ jobs: - uses: swift-actions/setup-swift@v2 if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' with: - swift-version: 6.0.3 + swift-version: '6.0' - name: Set up Python uses: actions/setup-python@v5 with: From 294dc24669a38708ca34c0fe7d16ee4462026710 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Tue, 28 Jan 2025 23:35:19 +0000 Subject: [PATCH 08/12] Tweaks to repotests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 58db22938..d7cd4c7c3 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -70,7 +70,7 @@ jobs: packages: 'platform-tools' - run: sdkmanager --uninstall "build-tools;30.0.3" - uses: swift-actions/setup-swift@v2 - if: matrix.os == 'ubuntu-24.04' || matrix.os == 'ubuntu-24.04-arm' + if: matrix.os == 'ubuntu-24.04' with: swift-version: '6.0' - name: Set up Python @@ -458,6 +458,7 @@ jobs: CDXGEN_DEBUG_MODE=debug bin/cdxgen.js -p -r -t clojure repotests/ziggurat -o bomresults/bom-clj.json --fail-on-error shell: bash - name: repotests swift-markdown + if: matrix.os == 'ubuntu-24.04' run: | CDXGEN_DEBUG_MODE=debug bin/cdxgen.js -p -r -t swift repotests/swift-markdown -o bomresults/bom-swift.json CDXGEN_DEBUG_MODE=debug bin/cdxgen.js -p -r -t swift repotests/swift-markdown -o bomresults/bom-swift.json --profile research From c45d4ace2106072cee6d3bad4c4dc5d47a8247a1 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 29 Jan 2025 00:06:05 +0000 Subject: [PATCH 09/12] macos-15 tests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index d7cd4c7c3..6a18dc749 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -15,7 +15,7 @@ jobs: fail-fast: true matrix: node-version: ['23.x'] - os: ['ubuntu-24.04', 'ubuntu-24.04-arm', 'windows-latest'] + os: ['ubuntu-24.04', 'ubuntu-24.04-arm', 'windows-latest', 'macos-15'] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -50,6 +50,10 @@ jobs: curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.20.0/bazelisk-linux-arm64" sudo mv bazelisk-linux-arm64 /usr/local/bin/bazel chmod +x /usr/local/bin/bazel + - name: Install bazelisk - mac + if: matrix.os == 'macos-15' + run: | + brew install bazelisk - name: Install bazelisk - windows if: matrix.os == 'windows-latest' run: choco install -y bazel @@ -70,7 +74,7 @@ jobs: packages: 'platform-tools' - run: sdkmanager --uninstall "build-tools;30.0.3" - uses: swift-actions/setup-swift@v2 - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15' with: swift-version: '6.0' - name: Set up Python @@ -458,7 +462,7 @@ jobs: CDXGEN_DEBUG_MODE=debug bin/cdxgen.js -p -r -t clojure repotests/ziggurat -o bomresults/bom-clj.json --fail-on-error shell: bash - name: repotests swift-markdown - if: matrix.os == 'ubuntu-24.04' + if: matrix.os == 'ubuntu-24.04' || matrix.os == 'macos-15' run: | CDXGEN_DEBUG_MODE=debug bin/cdxgen.js -p -r -t swift repotests/swift-markdown -o bomresults/bom-swift.json CDXGEN_DEBUG_MODE=debug bin/cdxgen.js -p -r -t swift repotests/swift-markdown -o bomresults/bom-swift.json --profile research From 6f40c2acded45b775aae32b43a871b1278889bd3 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 29 Jan 2025 00:40:57 +0000 Subject: [PATCH 10/12] macos-15 tests Signed-off-by: Prabhu Subramanian --- .github/workflows/dockertests.yml | 1 - .github/workflows/repotests.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index 8f81ecb1e..4e663c625 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -96,7 +96,6 @@ jobs: docker rmi centos:latest bin/cdxgen.js -t docker-compose test/data -o bomresults/bom-dc.json --fail-on-error bin/cdxgen.js -t operator repotests/grafana-operator -o bomresults/bom-op.json --fail-on-error - rm /tmp/scanslim.tar ls -ltr bomresults env: CDXGEN_DEBUG_MODE: debug diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 6a18dc749..89f73c8d1 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -413,6 +413,7 @@ jobs: CDXGEN_DEBUG_MODE=debug ASTGEN_IGNORE_DIRS="" node bin/evinse.js -i bomresults/bom-svelte.json -o bomresults/bom-svelte.evinse.json -l javascript --with-reachables -p repotests/sveltejs-examples shell: bash - name: repotests shiftleft-go-example + if: matrix.os != 'macos-15' run: | FETCH_LICENSE=false bin/cdxgen.js -p -r -t go repotests/shiftleft-go-example -o bomresults/bom-go.json --fail-on-error --export-proto shell: bash From 2d0b4ea2bb542dd812f00fe0a961ed5bf6b0a740 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 29 Jan 2025 08:34:38 +0000 Subject: [PATCH 11/12] macos-15 needs better go tests Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 89f73c8d1..3884eb7ea 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -583,7 +583,6 @@ jobs: SBOM_SIGN_ALGORITHM=RS512 SBOM_SIGN_PRIVATE_KEY=bomresults/private.key SBOM_SIGN_PUBLIC_KEY=bomresults/public.key bin/cdxgen.js -p -r -t github repotests/shiftleft-java-example -o bomresults/1.6-bom-github.json --spec-version 1.6 FETCH_LICENSE=0 bin/cdxgen.js -r -t js repotests/shiftleft-ts-example -o bomresults/1.6-bom-ts-1.json --fail-on-error --spec-version 1.6 FETCH_LICENSE=1 bin/cdxgen.js -r -t js repotests/shiftleft-ts-example --required-only -o bomresults/1.6-bom-ts-2.json --fail-on-error --spec-version 1.6 - FETCH_LICENSE=false bin/cdxgen.js -r -t go repotests/shiftleft-go-example -o bomresults/1.6-bom-go.json --fail-on-error --spec-version 1.6 FETCH_LICENSE=true bin/cdxgen.js -r -t csharp repotests/vulnerable_net_core -o bomresults/1.6-bom-csharp2.json --spec-version 1.6 FETCH_LICENSE=false bin/cdxgen.js -r repotests/Goatly.NET -o bomresults/1.6-bom-csharp3.json --spec-version 1.6 FETCH_LICENSE=true bin/cdxgen.js -r -t python repotests/DjanGoat -o bomresults/1.6-bom-python.json --fail-on-error --spec-version 1.6 @@ -595,7 +594,6 @@ jobs: SBOM_SIGN_ALGORITHM=RS512 SBOM_SIGN_PRIVATE_KEY=bomresults/private.key SBOM_SIGN_PUBLIC_KEY=bomresults/public.key bin/cdxgen.js -p -r -t github repotests/shiftleft-java-example -o bomresults/1.4-bom-github.json --spec-version 1.4 FETCH_LICENSE=0 bin/cdxgen.js -r -t js repotests/shiftleft-ts-example -o bomresults/1.4-bom-ts-1.json --fail-on-error --spec-version 1.4 FETCH_LICENSE=1 bin/cdxgen.js -r -t js repotests/shiftleft-ts-example --required-only -o bomresults/1.4-bom-ts-2.json --fail-on-error --spec-version 1.4 - FETCH_LICENSE=false bin/cdxgen.js -r -t go repotests/shiftleft-go-example -o bomresults/1.4-bom-go.json --fail-on-error --spec-version 1.4 FETCH_LICENSE=true bin/cdxgen.js -r -t csharp repotests/vulnerable_net_core -o bomresults/1.4-bom-csharp2.json --spec-version 1.4 FETCH_LICENSE=false bin/cdxgen.js -r repotests/Goatly.NET -o bomresults/1.4-bom-csharp3.json --spec-version 1.4 FETCH_LICENSE=true bin/cdxgen.js -r -t python repotests/DjanGoat -o bomresults/1.4-bom-python.json --fail-on-error --spec-version 1.4 From 6cad8b274556c51725d46723adbb7ee4dfccee51 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Wed, 29 Jan 2025 10:38:20 +0000 Subject: [PATCH 12/12] macos-15 tests Signed-off-by: Prabhu Subramanian --- .github/workflows/dockertests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index 4e663c625..eb79db411 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -152,12 +152,12 @@ jobs: env: CDXGEN_DEBUG_MODE: debug os-tests: - runs-on: [ubuntu-24.04, ubuntu-24.04-arm] - strategy: matrix: node-version: ['23.x'] java-version: ['23'] + os: [ubuntu-24.04, ubuntu-24.04-arm] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }}