Skip to content

Commit 1bcdf09

Browse files
ci(release): update changesets auto-merge logic (#9703)
* ci: update changesets auto-merge logic * Intentionally breaking build * Undo intentional break * Remove auto since we don't have auto-merge
1 parent 5e8fd61 commit 1bcdf09

File tree

1 file changed

+14
-17
lines changed

1 file changed

+14
-17
lines changed

.github/workflows/release.yml

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,24 @@ jobs:
3434
- name: Stop Nx Agents
3535
if: ${{ always() }}
3636
run: npx nx-cloud stop-all-agents
37-
- name: Version Packages
38-
run: pnpm run changeset:version
37+
- name: Run Changesets (version or publish)
38+
id: changesets
39+
uses: changesets/[email protected]
40+
with:
41+
version: pnpm run changeset:version
42+
publish: pnpm run changeset:publish
43+
commit: 'ci: Version Packages'
44+
title: 'ci: Version Packages'
3945
env:
4046
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
41-
- name: Commit version files
42-
run: |
43-
if [[ -n "$(git status --porcelain)" ]]; then
44-
git config --global user.name 'Tanner Linsley'
45-
git config --global user.email '[email protected]'
46-
git add -A
47-
git commit -m "ci: Version Packages"
48-
git push
49-
fi
47+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
48+
- name: Auto-merge Changesets PR
49+
if: steps.changesets.outputs.hasChangesets
50+
run: gh pr --repo "$REPO" merge --squash "$PR_NUM"
5051
env:
5152
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52-
- name: Publish Packages
53-
run: |
54-
npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
55-
pnpm run changeset:publish
56-
env:
57-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
53+
PR_NUM: ${{ steps.changesets.outputs.pullRequestNumber }}
54+
REPO: ${{ github.repository }}
5855
- name: Upload coverage to Codecov
5956
uses: codecov/[email protected]
6057
with:

0 commit comments

Comments
 (0)