Skip to content

Commit 340dce9

Browse files
committed
format + fix lint job maybe
1 parent d1cf9cf commit 340dce9

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ jobs:
2222
then
2323
echo "SINCE=$SHA^1" >> $GITHUB_OUTPUT
2424
else
25-
echo "SINCE=$(git merge-base origin/$PR_REF $SHA)" >> $GITHUB_OUTPUT
25+
echo "SINCE=$(git merge-base $BASE_REF $SHA)" >> $GITHUB_OUTPUT
2626
fi
2727
env:
2828
PR_REF: ${{ github.event.pull_request.head.ref }}
29+
BASE_REF: origin/${{ github.event.pull_request.base.ref }}
2930
SHA: ${{ github.sha }}
3031

3132
- run: npm install -g corepack@latest && corepack enable

.github/workflows/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ jobs:
1717
fetch-depth: 0
1818
- name: "Extracting the merge base into 'SINCE'"
1919
id: since
20-
env:
21-
PR_REF: ${{ github.event.pull_request.head.ref }}
20+
env:
21+
PR_REF: ${{ github.event.pull_request.head.ref }}
22+
BASE_REF: origin/${{ github.event.pull_request.base.ref }}
2223
run: |
2324
if [ -z $PR_REF ]
2425
then
2526
echo "SINCE=${{ github.sha }}^1" >> $GITHUB_OUTPUT
2627
else
27-
echo "SINCE=$(git merge-base origin/${{ github.event.pull_request.base.ref }} ${{ github.sha }})" >> $GITHUB_OUTPUT
28+
echo "SINCE=$(git merge-base $BASE_REF ${{ github.sha }})" >> $GITHUB_OUTPUT
2829
fi
2930
3031
- run: npm install -g corepack@latest && corepack enable
@@ -55,7 +56,7 @@ jobs:
5556
fetch-depth: 0
5657
- name: "Extracting the merge base into 'SINCE'"
5758
id: since
58-
env:
59+
env:
5960
PR_REF: ${{ github.event.pull_request.head.ref }}
6061
run: |
6162
if [ -z $PR_REF ]

0 commit comments

Comments
 (0)