Skip to content

Commit 52a72bd

Browse files
workflow
1 parent d92a470 commit 52a72bd

1 file changed

Lines changed: 4 additions & 11 deletions

File tree

.github/workflows/auto-merge-upstream.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,13 @@ jobs:
3030
git merge upstream/main
3131
3232
- name: Push merged changes to main
33-
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35-
run: git push origin HEAD:main
36-
33+
run: git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/adrianstephens/TypeScript.git HEAD:main
34+
3735
- name: Merge operators into main
38-
run: |
39-
git merge origin/operators
36+
run: git merge origin/operators
4037

4138
- name: Push merged changes to operators
42-
env:
43-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
run: git push origin HEAD:operators
39+
run: git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/adrianstephens/TypeScript.git HEAD:operators
4540

4641
- name: Checkout operators branch
4742
run: git checkout operators
@@ -62,8 +57,6 @@ jobs:
6257

6358
- name: Publish to npm
6459
if: success()
65-
env:
66-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
6760
run: |
6861
npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
6962
npm publish --access public

0 commit comments

Comments
 (0)