Skip to content

Commit bae6afa

Browse files
author
merge-queue-bot
committed
Merge PR #173: Simplify merge queue workflow configuration
2 parents 4e91011 + 82a1f35 commit bae6afa

1 file changed

Lines changed: 3 additions & 23 deletions

File tree

.github/workflows/merge-queue.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Merge Queue
22

3-
# Dummy change to test merge queue action.
4-
53
on:
64
pull_request:
75
types: [labeled]
@@ -18,37 +16,19 @@ concurrency:
1816
group: merge-queue
1917
cancel-in-progress: false
2018

21-
permissions: {}
22-
2319
jobs:
2420
queue:
25-
if: >-
26-
github.event_name == 'workflow_dispatch' ||
27-
(github.event.label.name == 'queue' &&
28-
github.event.pull_request.base.ref == 'main' &&
29-
github.event.pull_request.head.repo.full_name == github.repository)
3021
runs-on: ubuntu-latest
31-
permissions:
32-
contents: write
33-
pull-requests: write
34-
actions: write
35-
issues: write
3622
steps:
3723
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3824
with:
3925
fetch-depth: 0
4026
token: ${{ secrets.MERGE_QUEUE_TOKEN }}
41-
persist-credentials: false
42-
43-
- name: Configure git identity
44-
run: |
45-
git config user.email "merge-queue@users.noreply.github.com"
46-
git config user.name "merge-queue-bot"
4727

48-
- uses: jeduden/merge-queue-action@5adb5a76e27e96f1da5efd36f097a2c5233e9ad3 # v0.6.0
28+
- uses: jeduden/merge-queue-action@3be8077b142e4057d2fc097635d1ab6ada2bbbf5 # v0.7.1
4929
with:
5030
token: ${{ secrets.MERGE_QUEUE_TOKEN }}
5131
ci_workflow: .github/workflows/ci.yml
5232
batch_size: "5"
53-
bisect: ${{ github.event.inputs.bisect || false }}
54-
batch_prs: ${{ github.event.inputs.batch_prs || '' }}
33+
bisect: ${{ github.event.inputs.bisect }}
34+
batch_prs: ${{ github.event.inputs.batch_prs }}

0 commit comments

Comments
 (0)