Skip to content

Commit 71e508e

Browse files
authored
ci: Update scripts to fix compile errors (#1240)
1 parent 11ff6b6 commit 71e508e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/automerge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Attempt merge
17-
if: github.event.workflow_run.conclusion == 'success
17+
if: github.event.workflow_run.conclusion == 'success'
1818
uses: "pascalgn/[email protected]"
1919
env:
2020
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/label.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
runs-on: ubuntu-latest
2121

2222
steps:
23-
- uses: actions/labeler@v2
23+
- uses: actions/labeler@v3
2424
with:
25-
repo-token: "${{ env.TOKEN }}"
25+
repo-token: ${{ env.TOKEN }}
2626

2727
mergeable:
2828
name: Flag a PR ready to merge
@@ -34,9 +34,7 @@ jobs:
3434
if: |
3535
!contains(github.event.pull_request.labels.*.name, 'on hold') &&
3636
!contains(github.event.pull_request.labels.*.name, 'work in progress') &&
37-
github.event.review.state == 'approved' &&
38-
github.event.check_suite.status == 'completed' &&
39-
github.event.check_suite.conclusion == 'success'
37+
github.event.review.state == 'approved'
4038
uses: actions-ecosystem/action-add-labels@v1
4139
with:
4240
github_token: ${{ env.TOKEN }}

0 commit comments

Comments
 (0)