Skip to content
This repository was archived by the owner on Oct 23, 2023. It is now read-only.

Commit 7036b67

Browse files
authored
Merge pull request #327 from CSCfi/bugfix/auto-merge-refine
refine auto-merge updates
2 parents b1e1c3b + 24f3c29 commit 7036b67

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.github/workflows/dependabot-auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
with:
1717
github-token: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Wait other jobs are passed or failed
19-
if: ${{ contains(github.event.pull_request.labels.*.name, 'pip dependencies') || contains(github.event.pull_request.labels.*.name, 'github actions') }}
19+
if: ${{ steps.metadata.outputs.package-ecosystem == 'pip' || steps.metadata.outputs.package-ecosystem == 'github_actions' }}
2020
uses: kachick/wait-other-jobs@v1
2121
timeout-minutes: 30
2222
with:
2323
github-token: "${{ secrets.GITHUB_TOKEN }}"
2424
- name: Enable auto-merge for Dependabot PRs
25-
if: ${{ contains(github.event.pull_request.labels.*.name, 'pip dependencies') || contains(github.event.pull_request.labels.*.name, 'github actions') }}
25+
if: ${{ steps.metadata.outputs.package-ecosystem == 'pip' || steps.metadata.outputs.package-ecosystem == 'github_actions' }}
2626
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --merge "$PR_URL"
2727
env:
2828
PR_URL: ${{github.event.pull_request.html_url}}

0 commit comments

Comments
 (0)