@@ -69,22 +69,27 @@ jobs:
69
69
- name : Create PR with new app version
70
70
working-directory : packages/clippy
71
71
env :
72
- GH_TOKEN : ${{ secrets.MERGE_BOT_TOKEN }}
72
+ GH_TOKEN : ${{ secrets.CI_DEPLOY_SECRET }}
73
73
run : |
74
74
git config user.name "github-actions"
75
75
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 }}
80
77
git add versions.json
81
78
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"
83
88
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