Merge pull request #53 from hashicorp/smre-177-node20-update

SMRE-177 update to Node20
hashicorp · May 8, 2024 · 37358f6 · 37358f6
2 parents 0da08f8 + 9209078
commit 37358f6
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       # Dogfood this Action to build its own CLI.
       - uses: ./
         with:

diff --git a/.github/workflows/example-matrix.yml b/.github/workflows/example-matrix.yml
@@ -9,10 +9,10 @@ jobs:
           - { runner: macos-latest,  os: darwin,  arch: amd64, tags: netcgo        }
           - { runner: macos-latest,  os: darwin,  arch: arm64, tags: netcgo        }
           - { runner: ubuntu-latest, os: linux,   arch: amd64, env:  CGO_ENABLED=0 }
-          - { runner: ubuntu-latest, os: linux,   arch: amd64, env:  CGO_ENABLED=0 }
+          - { runner: ubuntu-latest, os: linux,   arch: arm64, env:  CGO_ENABLED=0 }
           - { runner: ubuntu-latest, os: windows, arch: amd64, env:  CGO_ENABLED=0 }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - name: Build
         uses: hashicorp/actions-go-build@main
         with:

diff --git a/.github/workflows/example-matrix.yml.currentbranch.yml b/.github/workflows/example-matrix.yml.currentbranch.yml
diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
@@ -4,7 +4,7 @@ jobs:
   example:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - name: Build
         uses: hashicorp/actions-go-build@main
         with:

diff --git a/.github/workflows/example.yml.currentbranch.yml b/.github/workflows/example.yml.currentbranch.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - name: Build CLI Binaries
         run: make release/zips
       - name: Create GitHub Release

diff --git a/.github/workflows/self-test-suite-verify.yml b/.github/workflows/self-test-suite-verify.yml
@@ -30,10 +30,13 @@ jobs:
           - { assert: failure, file: this-file-does-not-exist,            when: result file is missing }
           - { assert: failure, file: corrupt,                             when: result file is corrupt }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      # generate a random ID; GH doesn't provide a proper job ID (especially for matrix jobs)
+      - name: Generate random ID to distinguish build artifacts
+        run: echo "ARTIFACT_ID=$RANDOM" >> "$GITHUB_ENV"
       - uses: ./verify/self-test
         with:
           assert: ${{ matrix.assert }}
           when: ${{ matrix.when }}
           result_file: verify/testdata/${{ matrix.file }}.buildresult.json
-          output_file: verification-result-${{ inputs.runner }}.json
+          output_file: verification-result-${{ inputs.runner }}-${{ env.ARTIFACT_ID }}.json
diff --git a/.github/workflows/self-test-suite.yml b/.github/workflows/self-test-suite.yml
@@ -17,6 +17,10 @@ jobs:
   # with different sets of inputs, and assert that the action succeeds or
   # fails correctly.
 
+  # Each test uses a distinct product_name that must account for both the job name
+  # and the variants introduced via job matrix in order to avoid duplicate artifact
+  # names (which cannot be uploaded as of actions/upload-artifact@v4.
+
   # A single reproducible go binary.
   ok-single-file:
     runs-on: ${{ inputs.runner }}
@@ -28,9 +32,13 @@ jobs:
           - { reproducible: report, want: success }
           - { reproducible: nope,   want: success }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - name: select OS value
+        run: case "${{ runner.os }}" in macOS) echo "SELECTED_OS=darwin" >> "$GITHUB_ENV" ;; Linux) echo "SELECTED_OS=linux" >> "$GITHUB_ENV" ;; esac
       - uses: ./self-test
         with:
+          product_name: "example-app-${{ github.job }}-${{ matrix.reproducible }}"
+          os: ${{ env.SELECTED_OS }}
           reproducible: ${{ matrix.reproducible }}
           assert: ${{ matrix.want }}
           when: "the binary files are identical and there are no other files in the zip"
@@ -49,9 +57,13 @@ jobs:
           - { reproducible: report, want: success }
           - { reproducible: nope,   want: success }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - name: select OS value
+        run: case "${{ runner.os }}" in macOS) echo "SELECTED_OS=darwin" >> "$GITHUB_ENV" ;; Linux) echo "SELECTED_OS=linux" >> "$GITHUB_ENV" ;; esac
       - uses: ./self-test
         with:
+          product_name: "example-app-${{ github.job }}-${{ matrix.reproducible }}"
+          os: ${{ env.SELECTED_OS }}
           reproducible: ${{ matrix.reproducible }}
           assert: ${{ matrix.want }}
           when: "the binary files are identical and so are two other files in the zip"
@@ -79,11 +91,12 @@ jobs:
           - { reproducible: report, os: darwin, arch: arm64, want: success }
           - { reproducible: nope,   os: darwin, arch: arm64, want: success }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         if: runner.os == 'macOS'
       - uses: ./self-test
         if: runner.os == 'macOS'
         with:
+          product_name: "example-app-${{ github.job }}-${{ matrix.reproducible }}"
           os: ${{ matrix.os }}
           arch: ${{ matrix.arch }}
           reproducible: ${{ matrix.reproducible }}
@@ -104,9 +117,13 @@ jobs:
           - { reproducible: report, want: success }
           - { reproducible: nope,   want: success }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - name: select OS value
+        run: case "${{ runner.os }}" in macOS) echo "SELECTED_OS=darwin" >> "$GITHUB_ENV" ;; Linux) echo "SELECTED_OS=linux" >> "$GITHUB_ENV" ;; esac
       - uses: ./self-test
         with:
+          product_name: "example-app-${{ github.job }}-${{ matrix.reproducible }}"
+          os: ${{ env.SELECTED_OS }}
           reproducible: ${{ matrix.reproducible }}
           assert: ${{ matrix.want }}
           when: "the binary files reproduce but the zip files do not"
@@ -127,9 +144,13 @@ jobs:
           - { reproducible: report, want: success }
           - { reproducible: nope,   want: success }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - name: select OS value
+        run: case "${{ runner.os }}" in macOS) echo "SELECTED_OS=darwin" >> "$GITHUB_ENV" ;; Linux) echo "SELECTED_OS=linux" >> "$GITHUB_ENV" ;; esac
       - uses: ./self-test
         with:
+          product_name: "example-app-${{ github.job }}-${{ matrix.reproducible }}"
+          os: ${{ env.SELECTED_OS }}
           reproducible: ${{ matrix.reproducible }}
           assert: ${{ matrix.want }}
           when: "neither the binary file not the zip file reproduce"
@@ -149,9 +170,13 @@ jobs:
           - { reproducible: report, want: failure }
           - { reproducible: nope,   want: failure }
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - name: select OS value
+        run: case "${{ runner.os }}" in macOS) echo "SELECTED_OS=darwin" >> "$GITHUB_ENV" ;; Linux) echo "SELECTED_OS=linux" >> "$GITHUB_ENV" ;; esac
       - uses: ./self-test
         with:
+          product_name: "example-app-${{ github.job }}-${{ matrix.reproducible }}"
+          os: ${{ env.SELECTED_OS }}
           reproducible: ${{ matrix.reproducible }}
           assert: ${{ matrix.want }}
           when: "the binary file is not written to the correct path"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,24 +3,24 @@ name: Test
 on:
   push:
     paths:
-      - '**'
-      - '!**.md'
-      - '!dev/**'
-      - '!verify/**'
-      - '!action.yml'
+      - "**"
+      - "!**.md"
+      - "!dev/**"
+      - "!verify/**"
+      - "!action.yml"
 
 jobs:
-
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/super-linter@45fc0d88288beee4701c62761281edfee85655d7 # v5.0.0
+      - uses: github/super-linter@4e51915f4a812abf59fed160bb14595c0a38a9e7 # v6
 
   go-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
         with:
           go-version-file: go.mod
+          cache: false
       - run: make test/go
diff --git a/action.yml b/action.yml
@@ -80,19 +80,22 @@ runs:
   steps:
 
     # Setup Go for CLI compilation.
-    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version: 1.18
+        cache: false
 
     - name: Action Setup
       shell: bash
       working-directory: ${{ github.action_path }}
       run: ./action-setup
 
     # Setup Go
-    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version: ${{ inputs.go_version }}
+        cache: false
+
 
     # Read config.
     - name: Read config from inputs; export to GITHUB_ENV
@@ -119,7 +122,7 @@ runs:
 
     # Upload Primary Build
     - name: Upload Primary Zip
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
         name: ${{ env.ZIP_NAME }}
         path: ${{ env.ZIP_PATH_PRIMARY }}
@@ -135,7 +138,7 @@ runs:
     # Upload Local Verification Build
     - name: Upload Local Verification Zip
       if: inputs.reproducible == 'assert' || inputs.reproducible == 'report'
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
         name: ${{ env.ZIP_NAME }}.local-verification-build.zip
         path: ${{ env.ZIP_PATH_VERIFICATION }}
@@ -168,7 +171,7 @@ runs:
     # Upload Verification Result
     - name: Upload Verification Result
       if: inputs.reproducible == 'assert' || inputs.reproducible == 'report'
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
         name: ${{ env.ZIP_NAME }}.verificationresult.json
         path: ${{ env.VERIFICATION_RESULT }}

diff --git a/self-test/action.yml b/self-test/action.yml
@@ -62,7 +62,7 @@ runs:
       id: build
       uses: ./ # The action at the root of this repo.
       with:
-        product_name: ${{ inputs.product_name }}_${{ github.job }}
+        product_name: ${{ inputs.product_name }}
         product_version: ${{ inputs.product_version }}
         go_version: ${{ inputs.go_version }}
         os: ${{ inputs.os }}

diff --git a/verify/action.yml b/verify/action.yml
@@ -26,9 +26,10 @@ runs:
   steps:
 
     # Setup Go for CLI compilation.
-    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version: 1.18
+        cache: false
 
     - name: Action Setup
       shell: bash
@@ -74,9 +75,10 @@ runs:
         $RUN_CLI inspect -build-config "$RESULT_FILE"
 
     # Setup Go For Running the Verification Build
-    - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+    - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version: ${{ env.GO_VERSION }}
+        cache: false
 
     # Verify Reproducibility
     - name: Verify Reproducibility
@@ -95,7 +97,7 @@ runs:
     # Store reproducibility report.
     - name: Upload Reproducibility Report
       if: always()
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
         path: ${{ env.VERIFICATION_RESULT }}
         name: ${{ env.OUTPUT_FILE }}