Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I leave this for you two. For security issue we intent to fix, this current version is good.

fi
env:
PR_REF: ${{ github.event.pull_request.head.ref }}
BASE_REF: origin/${{ github.event.pull_request.base.ref }}
Comment on lines +25 to +29
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here, maybe it'll fix the lint problem we've had (lint job succeeding before merging)

cc @Wauplin for viz

SHA: ${{ github.sha }}

- run: npm install -g corepack@latest && corepack enable
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ jobs:
fetch-depth: 0
- name: "Extracting the merge base into 'SINCE'"
id: since
env:
PR_REF: ${{ github.event.pull_request.head.ref }}
BASE_REF: origin/${{ github.event.pull_request.base.ref }}
run: |
if [ -z "${{ github.event.pull_request.head.ref }}" ]
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
Expand Down Expand Up @@ -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
Expand Down