Skip to content

Commit 883c384

Browse files
committed
Fixes backmerge workflow app token inputs
1 parent b74e251 commit 883c384

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/backmerge-pr.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@
77
# The GitHub App must be added to the develop ruleset bypass list.
88
#
99
# Required repo config:
10+
# https://github.com/organizations/easyscience/settings/secrets/actions
11+
# https://github.com/organizations/easyscience/settings/variables/actions
1012
# - Actions secret: ES_BACKMERGE_PRIVATE_KEY (GitHub App private key PEM)
1113
# - Actions variable: ES_BACKMERGE_APP_ID (GitHub App ID)
1214

1315
name: Backmerge PR (tag -> develop)
1416

1517
on:
1618
push:
17-
tags:
18-
- 'v*'
19+
branches: ['**']
20+
tags: ['v*']
1921

2022
permissions:
2123
contents: write
@@ -30,8 +32,8 @@ jobs:
3032
id: app-token
3133
uses: actions/create-github-app-token@v2
3234
with:
33-
app-id: ${{ secrets.ES_BACKMERGE_APP_ID }} # in secrets or vars?
34-
private-key: ${{ secrets.ES_BACKMERGE_PRIVATE_KEY }}
35+
app-id: ${{ vars.BACKMERGE_APP_ID }}
36+
private-key: ${{ secrets.BACKMERGE_PRIVATE_KEY }}
3537

3638
- name: Checkout tag commit
3739
uses: actions/checkout@v5

0 commit comments

Comments
 (0)