File tree 2 files changed +16
-7
lines changed
2 files changed +16
-7
lines changed Original file line number Diff line number Diff line change 12
12
13
13
env :
14
14
SOURCE_BRANCH : master
15
- TAGRET_BRANCH : develop
15
+ TARGET_BRANCH : develop
16
16
17
17
jobs :
18
18
main :
35
35
pr_title : ' [Gitflow] Merge ${{ env.SOURCE_BRANCH }} into ${{ env.TARGET_BRANCH }}'
36
36
pr_body : ' Merge ${{ env.SOURCE_BRANCH }} branch into ${{ env.TARGET_BRANCH }}'
37
37
pr_label : ' Dev: Gitflow'
38
+ # This token is scoped to Daniel Griesser
39
+ github_token : ${{ secrets.REPO_SCOPED_TOKEN }}
38
40
39
41
# https://github.com/marketplace/actions/enable-pull-request-automerge
40
42
- name : Enable automerge for PR
47
49
# https://github.com/marketplace/actions/auto-approve
48
50
- name : Auto approve PR
49
51
# Always skip this for now, until we got a proper bot setup
50
- if : steps.open-pr.outputs.pr_number != '' || 1 == 2
52
+ if : steps.open-pr.outputs.pr_number != ''
51
53
uses : hmarr/auto-approve-action@v3
52
54
with :
53
55
pull-request-number : ${{ steps.open-pr.outputs.pr_number }}
54
56
review-message : ' Auto approved automated PR'
55
- # TODO: Use the token of some user here??
56
- # github-token: ${{ secrets.SOME_USERS_PAT }}
Original file line number Diff line number Diff line change 32
32
pr_title : ' [Gitflow] Merge ${{ github.ref_name }} into ${{ env.MAIN_BRANCH }}'
33
33
pr_body : ' Merge ${{ github.ref_name }} branch into ${{ env.MAIN_BRANCH }}'
34
34
pr_label : ' Dev: Gitflow'
35
+ # This token is scoped to Daniel Griesser
36
+ github_token : ${{ secrets.REPO_SCOPED_TOKEN }}
35
37
36
38
# https://github.com/marketplace/actions/enable-pull-request-automerge
37
39
- name : Enable automerge for PR
@@ -44,10 +46,17 @@ jobs:
44
46
# https://github.com/marketplace/actions/auto-approve
45
47
- name : Auto approve PR
46
48
# Always skip this for now, until we got a proper bot setup
47
- if : steps.open-pr.outputs.pr_number != '' || 1 == 2
49
+ if : steps.open-pr.outputs.pr_number != ''
48
50
uses : hmarr/auto-approve-action@v3
49
51
with :
50
52
pull-request-number : ${{ steps.open-pr.outputs.pr_number }}
51
53
review-message : ' Auto approved automated PR'
52
- # TODO: Use the token of some user here??
53
- # github-token: ${{ secrets.SOME_USERS_PAT }}
54
+
55
+ skipped :
56
+ runs-on : ubuntu-20.04
57
+ if : |
58
+ github.event.pull_request.merged == false
59
+ || startsWith(github.event.pull_request.title, "meta(changelog):") == false
60
+ steps :
61
+ - name : Sync skipped
62
+ run : echo "OK"
You can’t perform that action at this time.
0 commit comments