From 61c7a70286f5838b822d6102da18b56e0836174c Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Wed, 23 Apr 2025 11:33:37 +0200 Subject: [PATCH 1/5] chore(changelog-check): use action_sha instead of action_ref --- .github/workflows/changelog-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml index 5be01306..179f30dc 100644 --- a/.github/workflows/changelog-check.yml +++ b/.github/workflows/changelog-check.yml @@ -57,7 +57,7 @@ jobs: uses: actions/checkout@v4 with: repository: MetaMask/github-tools - ref: ${{ github.action_ref }} + ref: ${{ github.action_sha }} path: github-tools - name: Enable Corepack From 54be389580cc60eff2bfadfb77636dafcc7c2d72 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Wed, 23 Apr 2025 11:50:11 +0200 Subject: [PATCH 2/5] Add debug logs --- .github/workflows/changelog-check.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml index 179f30dc..05105297 100644 --- a/.github/workflows/changelog-check.yml +++ b/.github/workflows/changelog-check.yml @@ -52,6 +52,12 @@ jobs: path: target-repo fetch-depth: 0 + - name: Debug Action SHA + if: ${{ steps.label-check.outputs.skip_check != 'true' }} + run: | + echo "Action SHA: ${{ github.action_sha }}" + shell: bash + - name: Checkout github-tools repository if: ${{ steps.label-check.outputs.skip_check != 'true' }} uses: actions/checkout@v4 From f599e07b67b5b66b8f13d8c8aaad328945d15a36 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Wed, 23 Apr 2025 11:57:52 +0200 Subject: [PATCH 3/5] add action-sha --- .github/workflows/changelog-check.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml index 05105297..1b684184 100644 --- a/.github/workflows/changelog-check.yml +++ b/.github/workflows/changelog-check.yml @@ -3,6 +3,10 @@ name: Check Changelog on: workflow_call: inputs: + action-sha: + description: 'The SHA of the action to use' + required: false + type: string base-branch: required: false type: string @@ -55,7 +59,7 @@ jobs: - name: Debug Action SHA if: ${{ steps.label-check.outputs.skip_check != 'true' }} run: | - echo "Action SHA: ${{ github.action_sha }}" + echo "Action SHA: ${{ inputs.action-sha }}" shell: bash - name: Checkout github-tools repository @@ -63,7 +67,7 @@ jobs: uses: actions/checkout@v4 with: repository: MetaMask/github-tools - ref: ${{ github.action_sha }} + ref: ${{ inputs.action-sha || 'main' }} path: github-tools - name: Enable Corepack From 7f96bfc5afbeab3e966aa7e7d320a65c584e4fc7 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Wed, 23 Apr 2025 11:58:46 +0200 Subject: [PATCH 4/5] add main fallback to debug step --- .github/workflows/changelog-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml index 1b684184..0916df1c 100644 --- a/.github/workflows/changelog-check.yml +++ b/.github/workflows/changelog-check.yml @@ -59,7 +59,7 @@ jobs: - name: Debug Action SHA if: ${{ steps.label-check.outputs.skip_check != 'true' }} run: | - echo "Action SHA: ${{ inputs.action-sha }}" + echo "Action SHA: ${{ inputs.action-sha || 'main' }}" shell: bash - name: Checkout github-tools repository From 5af9094a52045afa865077e2ccfb854f41bb4789 Mon Sep 17 00:00:00 2001 From: Salah-Eddine Saakoun Date: Mon, 5 May 2025 22:07:58 +0200 Subject: [PATCH 5/5] fix: add action-sha input for correct repository checkout Add required action-sha input to ensure we checkout the same version of github-tools that was used in the workflow call. --- .github/workflows/changelog-check.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/changelog-check.yml b/.github/workflows/changelog-check.yml index 0916df1c..557edb21 100644 --- a/.github/workflows/changelog-check.yml +++ b/.github/workflows/changelog-check.yml @@ -5,7 +5,7 @@ on: inputs: action-sha: description: 'The SHA of the action to use' - required: false + required: true type: string base-branch: required: false @@ -56,18 +56,12 @@ jobs: path: target-repo fetch-depth: 0 - - name: Debug Action SHA - if: ${{ steps.label-check.outputs.skip_check != 'true' }} - run: | - echo "Action SHA: ${{ inputs.action-sha || 'main' }}" - shell: bash - - name: Checkout github-tools repository if: ${{ steps.label-check.outputs.skip_check != 'true' }} uses: actions/checkout@v4 with: repository: MetaMask/github-tools - ref: ${{ inputs.action-sha || 'main' }} + ref: ${{ inputs.action-sha }} path: github-tools - name: Enable Corepack