Skip to content

Commit b535783

Browse files
authored
Use botwoo machine user to merge trunk changes in develop (#5173)
1 parent 5e9bedc commit b535783

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/post-release-updates.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,12 @@ jobs:
8585
with:
8686
ref: 'trunk'
8787
fetch-depth: 0
88+
token: ${{ SECRETS.BOTWOO_TOKEN }}
8889

8990
- name: "Merge trunk back into develop"
9091
run: |
91-
git config user.name "${{ github.actor }}"
92-
git config user.email "${{ github.actor }}@users.noreply.github.com"
92+
git config user.name "botwoo"
93+
git config user.email "botwoo@users.noreply.github.com"
9394
git checkout develop && git pull
9495
git merge trunk --no-ff -m "Merge trunk v$RELEASE_VERSION into develop"
9596
git push
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Significance: patch
2+
Type: fix
3+
4+
Use botwoo user for a job in the post-release-updates workflow

0 commit comments

Comments
 (0)