From 35802d9ec277d5763704183a17470acdf4a72af1 Mon Sep 17 00:00:00 2001 From: Guillaume LEGENDRE Date: Thu, 11 Dec 2025 10:44:02 +0100 Subject: [PATCH 1/3] Fix variable reference for PR_REF in workflow --- .github/workflows/test.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d73bcd82c0..7f9abea95c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,8 +17,11 @@ jobs: fetch-depth: 0 - name: "Extracting the merge base into 'SINCE'" id: since + env: + PR_REF: ${{ github.event.pull_request.head.ref }} + run: | - if [ -z "${{ github.event.pull_request.head.ref }}" ] + if [ -z $PR_REF ] then echo "SINCE=${{ github.sha }}^1" >> $GITHUB_OUTPUT else @@ -53,8 +56,10 @@ jobs: fetch-depth: 0 - name: "Extracting the merge base into 'SINCE'" id: since + env: + PR_REF: ${{ github.event.pull_request.head.ref }} run: | - if [ -z "${{ github.event.pull_request.head.ref }}" ] + if [ -z $PR_REF ] then echo "SINCE=${{ github.sha }}^1" >> $GITHUB_OUTPUT else From d1cf9cfb75495f8263868addf2db7e0c3dc7f155 Mon Sep 17 00:00:00 2001 From: Guillaume LEGENDRE Date: Thu, 11 Dec 2025 10:52:49 +0100 Subject: [PATCH 2/3] Fix formatting in test.yml workflow --- .github/workflows/test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f9abea95c..44bf70eeeb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,8 +18,7 @@ jobs: - name: "Extracting the merge base into 'SINCE'" id: since env: - PR_REF: ${{ github.event.pull_request.head.ref }} - + PR_REF: ${{ github.event.pull_request.head.ref }} run: | if [ -z $PR_REF ] then From 340dce941032092c5b854f6182184be3dcc8b981 Mon Sep 17 00:00:00 2001 From: coyotte508 Date: Fri, 12 Dec 2025 09:44:25 +0000 Subject: [PATCH 3/3] format + fix lint job maybe --- .github/workflows/lint.yml | 3 ++- .github/workflows/test.yml | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5e0373f0c5..3b10e3b8dc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,10 +22,11 @@ jobs: then echo "SINCE=$SHA^1" >> $GITHUB_OUTPUT else - echo "SINCE=$(git merge-base origin/$PR_REF $SHA)" >> $GITHUB_OUTPUT + echo "SINCE=$(git merge-base $BASE_REF $SHA)" >> $GITHUB_OUTPUT fi env: PR_REF: ${{ github.event.pull_request.head.ref }} + BASE_REF: origin/${{ github.event.pull_request.base.ref }} SHA: ${{ github.sha }} - run: npm install -g corepack@latest && corepack enable diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 44bf70eeeb..e99f6377f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,14 +17,15 @@ jobs: fetch-depth: 0 - name: "Extracting the merge base into 'SINCE'" id: since - env: - PR_REF: ${{ github.event.pull_request.head.ref }} + env: + PR_REF: ${{ github.event.pull_request.head.ref }} + BASE_REF: origin/${{ github.event.pull_request.base.ref }} run: | if [ -z $PR_REF ] then echo "SINCE=${{ github.sha }}^1" >> $GITHUB_OUTPUT else - echo "SINCE=$(git merge-base origin/${{ github.event.pull_request.base.ref }} ${{ github.sha }})" >> $GITHUB_OUTPUT + echo "SINCE=$(git merge-base $BASE_REF ${{ github.sha }})" >> $GITHUB_OUTPUT fi - run: npm install -g corepack@latest && corepack enable @@ -55,7 +56,7 @@ jobs: fetch-depth: 0 - name: "Extracting the merge base into 'SINCE'" id: since - env: + env: PR_REF: ${{ github.event.pull_request.head.ref }} run: | if [ -z $PR_REF ]