Skip to content

Commit 60bde10

Browse files
try to fix linting
1 parent 665a3c6 commit 60bde10

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
clean: 'false'
4040
fetch-depth: '0'
41-
ref: ${{ github.event.pull_request.head.ref }}
41+
ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
4242
repository: ${{ github.event.pull_request.head.repo.full_name }}
4343
token: ${{ secrets.RSG_BOT_TOKEN }}
4444
- name: Get Head Commit Message
@@ -54,8 +54,8 @@ jobs:
5454
run: |
5555
hk fix --from-ref "$DEFAULT_BRANCH" --to-ref "$HEAD"
5656
env:
57-
DEFAULT_BRANCH: ${{ github.event.pull_request.base.sha }}
58-
HEAD: ${{ github.event.pull_request.head.sha }}
57+
DEFAULT_BRANCH: ${{ github.event.pull_request.base.sha || github.event.merge_group.base_sha }}
58+
HEAD: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
5959
- name: Add & Commit
6060
env:
6161
GITHUB_TOKEN: ${{ secrets.RSG_BOT_TOKEN }}
@@ -64,4 +64,4 @@ jobs:
6464
with:
6565
commit_message: Automatically linting code
6666
repo: ${{ github.repository }}
67-
branch: ${{ github.event.pull_request.head.ref }}
67+
branch: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}

0 commit comments

Comments
 (0)