Skip to content

Commit 2f9da97

Browse files
authored
ci: update global workflows (#78)
1 parent 2096212 commit 2f9da97

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

.github/workflows/automerge.yml

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# This action is centrally managed in https://github.com/asyncapi/.github/
2-
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo.
1+
# This action is centrally managed in https://github.com/asyncapi/.github/
2+
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo.
33

44
name: Automerge release bump PR
55

@@ -19,9 +19,8 @@ on:
1919
- submitted
2020

2121
jobs:
22-
2322
autoapprove:
24-
if: github.event.pull_request.draft == false && (github.event.pull_request.user.login == 'asyncapi-bot' || github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]') && !contains(github.event.pull_request.labels.*.name, 'released')
23+
if: github.event.pull_request.draft == false && (github.actor == 'asyncapi-bot' || github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]') && !contains(github.event.pull_request.labels.*.name, 'released')
2524
runs-on: ubuntu-latest
2625
steps:
2726
- name: Autoapproving
@@ -39,8 +38,7 @@ jobs:
3938
owner: context.repo.owner,
4039
repo: context.repo.repo,
4140
labels: ['autoapproved']
42-
})
43-
41+
})
4442
4543
automerge:
4644
needs: [autoapprove]

.github/workflows/autoupdate.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
33

44
#This workflow is designed to work with:
5-
# - autoapprove and automerge workflows for dependabot and asyncapibot.
5+
# - autoapprove and automerge workflows for dependabot and asyncapibot.
66
# - special release branches that we from time to time create in upstream repos. If we open up PRs for them from the very beginning of the release, the release branch will constantly update with new things from the destination branch they are opened against
77

88
# It uses GitHub Action that auto-updates pull requests branches, whenever changes are pushed to their destination branch.
@@ -11,17 +11,21 @@
1111
name: autoupdate
1212

1313
on:
14-
push: {}
15-
16-
jobs:
14+
push:
15+
branches-ignore:
16+
- 'version-bump/**'
17+
- 'dependabot/**'
18+
- 'bot/**'
19+
- 'all-contributors/**'
1720

21+
jobs:
1822
autoupdate:
1923
runs-on: ubuntu-latest
2024
steps:
2125
- name: Autoupdating
2226
uses: docker://chinthakagodawita/autoupdate-action:v1
2327
env:
24-
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
28+
GITHUB_TOKEN: '${{ secrets.GH_TOKEN }}'
2529
PR_FILTER: "labelled"
2630
PR_LABELS: "autoapproved"
2731
PR_READY_STATE: "ready_for_review"

0 commit comments

Comments
 (0)