Skip to content

Commit

Permalink
ci: add bot user to the workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
vchirikov committed Oct 25, 2022
1 parent 15794a8 commit 87c832d
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,18 +279,17 @@ jobs:
continue-on-error: true
id: merge
env:
# expires each year
GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
run: |-
git config --global init.defaultBranch master
git config --global push.autoSetupRemote true
git config --global push.default current
git config --global merge.ff true
git config --global merge.conflictstyle zdiff3
git config --global --add safe.directory $GITHUB_WORKSPACE
git config --global user.name "vchirikov"
git config --global user.email "40987940+vchirikov@users.noreply.github.com"
git remote set-url origin https://${{ secrets.MY_GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git
git config --global user.name "verysimplenick"
git config --global user.email "922660+verysimplenick@users.noreply.github.com"
git remote set-url origin https://${{ secrets.BOT_GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git
git fetch origin master
git reset --hard && git clean -xdf
sha="${{ steps.gh.outputs.sha }}" ; sha_compact="${sha:0:8}" ; date=$(date '+%Y-%m-%d')
Expand Down

0 comments on commit 87c832d

Please sign in to comment.