Skip to content

Commit

Permalink
Update use of actions
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed May 1, 2024
1 parent 6524e5d commit 0bce072
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/merge-bot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ jobs:
steps:
- name: Wait other jobs
uses: kachick/wait-other-jobs@v3
with:
skip-same-workflow: 'true'
skip-list: |
[
{
"workflowFile": "release.yml"
}
]
timeout-minutes: 10
- name: Approve and merge
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash --delete-branch "$PR_URL"
Expand All @@ -52,6 +60,14 @@ jobs:
steps:
- name: Wait other jobs
uses: kachick/wait-other-jobs@v3
with:
skip-same-workflow: 'true'
skip-list: |
[
{
"workflowFile": "release.yml"
}
]
timeout-minutes: 10
- name: Approve and merge
run: gh pr review --approve "$PR_URL" && gh pr merge --auto --squash --delete-branch "$PR_URL"
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ jobs:
- uses: actions/checkout@v4
- name: Wait other jobs
uses: kachick/wait-other-jobs@v3
with:
skip-list: |
[
{
"workflowFile": "merge-bot-pr.yml"
}
]
if: startsWith(github.ref, 'refs/tags/')
- name: Release
uses: softprops/action-gh-release@v2
Expand Down

0 comments on commit 0bce072

Please sign in to comment.