From 70550849ad19a1c764d9efebe20b71ad2d3fd8ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 09:25:43 +0000 Subject: [PATCH 1/3] build(deps): bump actions/checkout from 3.6.0 to 4.0.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/f43a0e5ff2bd294095638e18286ca9a3d1956744...3df4ab11eba7bda6032a0b82a6bb43b11571feac) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- .github/workflows/ca-cert-updater.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/ossf-scorecard.yml | 2 +- .github/workflows/signsbom.yml | 2 +- .github/workflows/testsbom.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17700bcde..ae3ee219d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: variant: bisheng image: adoptopenjdk/centos7_build_image steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Build Linux run: ./build-farm/make-adopt-build-farm.sh @@ -122,7 +122,7 @@ jobs: variant: [temurin] steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Install Dependencies run: | @@ -294,7 +294,7 @@ jobs: shell: bash run: mkdir -p "$HOME" && git config --system core.autocrlf false && git config --global --add safe.directory '*' - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: set-safe-directory: false diff --git a/.github/workflows/ca-cert-updater.yml b/.github/workflows/ca-cert-updater.yml index 5582d24ea..8e1a98aa4 100644 --- a/.github/workflows/ca-cert-updater.yml +++ b/.github/workflows/ca-cert-updater.yml @@ -13,7 +13,7 @@ jobs: if: startsWith(github.repository, 'adoptium/') runs-on: ubuntu-latest steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index f1b9b5e56..2d16ee8eb 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -42,7 +42,7 @@ jobs: # Checkout the code base # ########################## - name: Checkout Code - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: # Full git history is needed to get a proper list of changed files within `super-linter` fetch-depth: 0 diff --git a/.github/workflows/ossf-scorecard.yml b/.github/workflows/ossf-scorecard.yml index 73c96d0ec..1b81b44af 100644 --- a/.github/workflows/ossf-scorecard.yml +++ b/.github/workflows/ossf-scorecard.yml @@ -20,7 +20,7 @@ jobs: id-token: write steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 with: persist-credentials: false - uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0 diff --git a/.github/workflows/signsbom.yml b/.github/workflows/signsbom.yml index 1b61f09b9..74ba7860a 100644 --- a/.github/workflows/signsbom.yml +++ b/.github/workflows/signsbom.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 # Build with jdk17 to ensure TemurinSignSBOM meets min compatibility - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 diff --git a/.github/workflows/testsbom.yml b/.github/workflows/testsbom.yml index 361249c77..e0ec80170 100644 --- a/.github/workflows/testsbom.yml +++ b/.github/workflows/testsbom.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 # Build with jdk8 to ensure TemurinGenSBOM meets min compatibility - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 From b9821c5bfd4118874d65d768ca38bb8aede8e854 Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 5 Sep 2023 11:04:33 +0100 Subject: [PATCH 2/3] install Node.js 20 from NVM --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae3ee219d..d87ea47a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,6 +68,13 @@ jobs: variant: bisheng image: adoptopenjdk/centos7_build_image steps: + # setup Node.js 20 from unofficial Mirror when using centos7_build_image + - uses: dcodeIO/setup-node-nvm@b6d6ed786666dee7d42186617cbb1394070de579 # v5 + if: matrix.image == 'adoptopenjdk/centos7_build_image' + with: + node-version: 20 + node-mirror: https://unofficial-builds.nodejs.org/download/ + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0 - name: Build Linux From ba46fb0c73de76f2f6b74dba2dc13a887328e19e Mon Sep 17 00:00:00 2001 From: George Adams Date: Tue, 5 Sep 2023 11:13:06 +0100 Subject: [PATCH 3/3] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d87ea47a5..8abd53296 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: if: matrix.image == 'adoptopenjdk/centos7_build_image' with: node-version: 20 - node-mirror: https://unofficial-builds.nodejs.org/download/ + node-mirror: https://unofficial-builds.nodejs.org/download/release/ - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0