Skip to content

Commit df7a52d

Browse files
authored
ci: try with deploy keys (#15)
1 parent 2dc2b9a commit df7a52d

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

.github/workflows/bump.app.version.yml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,27 @@ jobs:
6969
- name: Create PR with new app version
7070
working-directory: packages/clippy
7171
env:
72-
GH_TOKEN: ${{ secrets.MERGE_BOT_TOKEN }}
72+
GH_TOKEN: ${{ secrets.CI_DEPLOY_SECRET }}
7373
run: |
7474
git config user.name "github-actions"
7575
git config user.email "github-actions@github.com"
76-
77-
BRANCH_NAME="bump-app-version-${{ github.run_id }}"
78-
git checkout -b "$BRANCH_NAME"
79-
76+
git remote set-url origin https://x-access-token:${GH_TOKEN}@github.com/${{ github.repository }}
8077
git add versions.json
8178
git commit -m "chore: update app version to ${{ steps.set-app-version.outputs.new_app_version }}"
82-
git push origin "$BRANCH_NAME"
79+
git rebase --origin main
80+
git push
81+
82+
#BRANCH_NAME="bump-app-version-${{ github.run_id }}"
83+
#git checkout -b "$BRANCH_NAME"
84+
85+
#git add versions.json
86+
#git commit -m "chore: update app version to ${{ steps.set-app-version.outputs.new_app_version }}"
87+
#git push origin "$BRANCH_NAME"
8388
84-
# Create and auto-merge PR
85-
gh pr create --title "chore: bump app version to ${{ steps.set-app-version.outputs.new_app_version }}" \
86-
--body "This PR was auto-generated by GitHub Actions." \
87-
--base main \
88-
--head "$BRANCH_NAME"
89-
90-
gh pr merge "$BRANCH_NAME" --auto --squash --delete-branch
89+
## Create and auto-merge PR
90+
#gh pr create --title "chore: bump app version to ${{ steps.set-app-version.outputs.new_app_version }}" \
91+
# --body "This PR was auto-generated by GitHub Actions." \
92+
# --base main \
93+
# --head "$BRANCH_NAME"
94+
#
95+
#gh pr merge "$BRANCH_NAME" --auto --squash --delete-branch

0 commit comments

Comments
 (0)