Skip to content

Commit d3ce96b

Browse files
committed
Fix auto-merge token and add workflow permissions
1 parent d74fb4f commit d3ce96b

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
push:
66
branches: ['**']
77
tags: [v*]
8+
permissions:
9+
contents: write
10+
pull-requests: write
811
jobs:
912
build:
1013
# run on 1) push, 2) external PRs, 3) softwaremill-ci PRs
@@ -98,10 +101,13 @@ jobs:
98101
if: github.event.pull_request.user.login == 'softwaremill-ci'
99102
needs: [ build, label ]
100103
uses: softwaremill/github-actions-workflows/.github/workflows/auto-merge.yml@main
104+
secrets:
105+
github-token: ${{ secrets.SOFTWAREMILL_CI_PR_TOKEN }}
101106

102107
auto-merge-dependabot:
103108
# only for PRs by dependabot[bot]
104109
if: github.event.pull_request.user.login == 'dependabot[bot]'
105110
needs: [ build ]
106111
uses: softwaremill/github-actions-workflows/.github/workflows/auto-merge.yml@main
107-
secrets: inherit
112+
secrets:
113+
github-token: ${{ secrets.SOFTWAREMILL_CI_PR_TOKEN }}

0 commit comments

Comments
 (0)