From 740166e04b40abb24d5ee94e7d200f6b7f141c88 Mon Sep 17 00:00:00 2001 From: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:12:39 -0500 Subject: [PATCH 1/4] use node 20 Signed-off-by: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> --- .github/workflows/pre-submit.units.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-submit.units.yml b/.github/workflows/pre-submit.units.yml index a018fbe6d6..1f773fa5ae 100644 --- a/.github/workflows/pre-submit.units.yml +++ b/.github/workflows/pre-submit.units.yml @@ -42,10 +42,10 @@ jobs: with: go-version-file: "go.mod" - - name: Set Node.js 16 + - name: Set Node.js 20 uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: - node-version: 16 + node-version: 20 - name: unit tests run: | From 3134651dfcb46f7b6ada5f635d49f768e2e60ce7 Mon Sep 17 00:00:00 2001 From: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:30:33 -0500 Subject: [PATCH 2/4] fix: update pre-submit to ubuntu24 (#4080) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Summary Update pre-submit to use ubuntu24 https://github.com/slsa-framework/slsa-github-generator/actions/runs/12999310515/job/36254511524?pr=4041 ``` Run ./.github/workflows/scripts/pre-submit.e2e.go.default.sh ✖ ubuntu24 == ubuntu22 :: .predicate.invocation.environment.os should be ubuntu22 Error: Process completed with exit code 1. ``` ## Testing Process This PR's pre-submits should pass. ## Checklist - [x] Review the contributing [guidelines](https://github.com/slsa-framework/slsa-github-generator/blob/main/CONTRIBUTING.md) - [x] Add a reference to related issues in the PR description. - [ ] Update documentation if applicable. - [x] Add unit tests if applicable. - [ ] Add changes to the [CHANGELOG](https://github.com/slsa-framework/slsa-github-generator/blob/main/CHANGELOG.md) if applicable. Signed-off-by: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> --- .github/workflows/scripts/pre-submit.e2e.go.default.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/pre-submit.e2e.go.default.sh b/.github/workflows/scripts/pre-submit.e2e.go.default.sh index da64ef0e9c..ad6b18c99a 100755 --- a/.github/workflows/scripts/pre-submit.e2e.go.default.sh +++ b/.github/workflows/scripts/pre-submit.e2e.go.default.sh @@ -41,7 +41,7 @@ LDFLAGS=$(e2e_this_file | cut -d '.' -f4 | grep -v noldflags) e2e_verify_common_all "$ATTESTATION" # Verify Go specific environment vars are set -e2e_verify_predicate_invocation_environment "$ATTESTATION" "os" "ubuntu22" +e2e_verify_predicate_invocation_environment "$ATTESTATION" "os" "ubuntu24" e2e_verify_predicate_invocation_environment "$ATTESTATION" "arch" "X64" # Verify the subject and build type From 61917d60f15a0da44ab6adfe66efe5f2083b9b01 Mon Sep 17 00:00:00 2001 From: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> Date: Tue, 28 Jan 2025 19:14:01 +0000 Subject: [PATCH 3/4] use node 20 Signed-off-by: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> --- .github/workflows/pre-submit.actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-submit.actions.yml b/.github/workflows/pre-submit.actions.yml index eba9f47fc2..babbdfd93c 100644 --- a/.github/workflows/pre-submit.actions.yml +++ b/.github/workflows/pre-submit.actions.yml @@ -77,10 +77,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set Node.js 18 + - name: Set Node.js 20 uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: - node-version: 18 + node-version: 20 - name: Rebuild the dist/ directory working-directory: ${{ matrix.action }} From a60453e69bd949309219dde2d7ac2f632013664b Mon Sep 17 00:00:00 2001 From: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> Date: Tue, 28 Jan 2025 19:29:29 +0000 Subject: [PATCH 4/4] use node 22 Signed-off-by: Ramon Petgrave <32398091+ramonpetgrave64@users.noreply.github.com> --- .github/workflows/e2e.sign-attestations.schedule.yml | 2 +- .github/workflows/pre-submit.actions.yml | 6 +++--- .github/workflows/pre-submit.lint.yml | 8 ++++---- .github/workflows/pre-submit.units.yml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/e2e.sign-attestations.schedule.yml b/.github/workflows/e2e.sign-attestations.schedule.yml index c6b24f6e4b..aa76404738 100644 --- a/.github/workflows/e2e.sign-attestations.schedule.yml +++ b/.github/workflows/e2e.sign-attestations.schedule.yml @@ -42,7 +42,7 @@ jobs: - name: Setup node uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4 with: - node-version: 20 + node-version: 22 - name: install sigstore-js run: npm ci # TODO: Add subject verification. This only verifies the signature on the DSSE envelope. diff --git a/.github/workflows/pre-submit.actions.yml b/.github/workflows/pre-submit.actions.yml index 79ecffcbf3..cbf61416b5 100644 --- a/.github/workflows/pre-submit.actions.yml +++ b/.github/workflows/pre-submit.actions.yml @@ -77,10 +77,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set Node.js 20 + - name: Set Node.js 22 uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: - node-version: 20 + node-version: 22 - name: Rebuild the dist/ directory working-directory: ${{ matrix.action }} @@ -197,7 +197,7 @@ jobs: uses: ./__BUILDER_CHECKOUT_DIR__/.github/actions/secure-project-checkout-node with: path: __PROJECT_CHECKOUT_DIR__ - node-version: 16 + node-version: 22 secure-upload-folder: runs-on: ubuntu-latest diff --git a/.github/workflows/pre-submit.lint.yml b/.github/workflows/pre-submit.lint.yml index e75df4d8b2..5807116b66 100644 --- a/.github/workflows/pre-submit.lint.yml +++ b/.github/workflows/pre-submit.lint.yml @@ -37,7 +37,7 @@ jobs: go-version: "1.22.3" - uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 with: - node-version: 20 + node-version: 22 - name: Install gofumpt run: go install mvdan.cc/gofumpt@v0.6.0 @@ -76,7 +76,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: - node-version: 20 + node-version: 22 - run: make markdownlint golangci-lint: @@ -162,7 +162,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: - node-version: 20 + node-version: 22 - run: make eslint renovate-config-validator: @@ -171,5 +171,5 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: - node-version: 20 + node-version: 22 - run: make renovate-config-validator diff --git a/.github/workflows/pre-submit.units.yml b/.github/workflows/pre-submit.units.yml index aed66af43f..93a642da64 100644 --- a/.github/workflows/pre-submit.units.yml +++ b/.github/workflows/pre-submit.units.yml @@ -42,10 +42,10 @@ jobs: with: go-version-file: "go.mod" - - name: Set Node.js 20 + - name: Set Node.js 22 uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0 with: - node-version: 20 + node-version: 22 - name: unit tests run: |