Skip to content

Commit fa2b728

Browse files
tmilewskitmilewski
authored
chore(repo): Clean up workflows (clerk#2063)
* chore(repo): Clean up workflows * fix(repo): Add npx to changeset * chore(repo): More consistency in release commands
1 parent cb7fa1d commit fa2b728

5 files changed

Lines changed: 15 additions & 11 deletions

File tree

‎.github/actions/init/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,4 @@ runs:
120120
- name: Install Playwright Browsers
121121
if: inputs.playwright-enabled == 'true' && steps.playwright-cache.outputs.cache-hit != 'true'
122122
shell: bash
123-
run: npx playwright install --with-deps
123+
run: npx playwright install chromium

‎.github/workflows/release-canary.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@ jobs:
3939
id: version-packages
4040
run: npm run version:canary | tail -1 >> "$GITHUB_OUTPUT"
4141

42+
- name: Build release
43+
run: npx turbo build $TURBO_ARGS --force # TODO: Remove --force, when appropriate
44+
4245
- name: Canary release
4346
if: steps.version-packages.outputs.success == '1'
44-
run: npx turbo build $TURBO_ARGS && changeset publish --tag canary --no-git-tag
47+
run: npm run release:canary
4548
env:
4649
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4750
NPM_CONFIG_PROVENANCE: true
48-
TURBO_FORCE: true # TODO: Remove when comfortable
4951

5052
- name: Trigger workflows on related repos
5153
uses: actions/github-script@v6

‎.github/workflows/release-snapshot.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ jobs:
6666
id: version-packages
6767
run: npm run version:snapshot ${{ steps.extract-snapshot-name.outputs.name }} | tail -1 >> "$GITHUB_OUTPUT"
6868

69+
- name: Build release
70+
run: npx turbo build $TURBO_ARGS
71+
6972
- name: Snapshot release
7073
if: steps.version-packages.outputs.success == '1'
71-
run: npx turbo build $TURBO_ARGS && changeset publish --tag snapshot --no-git-tag
74+
run: npm run release:snapshot
7275
env:
7376
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
7477
NPM_CONFIG_PROVENANCE: true
75-
TURBO_FORCE: true # TODO: Remove when comfortable
7678

7779
- name: Package info
7880
if: steps.version-packages.outputs.success == '1'

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ jobs:
4545
turbo-token: ${{ secrets.TURBO_TOKEN }}
4646
playwright-enabled: true # Must be present to enable caching on branched workflows
4747

48-
- name: Build
49-
run: npx turbo build $TURBO_ARGS
48+
- name: Build release
49+
run: npx turbo build $TURBO_ARGS --force
5050

5151
- name: Create Release PR
5252
id: changesets
5353
uses: changesets/action@v1
5454
with:
5555
commit: "chore(repo): Version packages"
56-
publish: npx changeset publish && git push --follow-tags
56+
publish: npm run release
5757
env:
5858
GITHUB_TOKEN: ${{ secrets.CLERK_COOKIE_PAT }}
5959
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"lint:publint": "FORCE_COLOR=1 turbo lint:publint",
2525
"nuke": "./scripts/nuke.sh",
2626
"prepare": "husky install",
27-
"release": "TURBO_FORCE=true FORCE_COLOR=1 npm run build -- --force && changeset publish && git push --follow-tags",
28-
"release:canary": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && changeset publish --tag canary --no-git-tag",
29-
"release:snapshot": "TURBO_FORCE=true FORCE_COLOR=1 npm run build && changeset publish --tag snapshot --no-git-tag",
27+
"release": "changeset publish && git push --follow-tags",
28+
"release:canary": "changeset publish --tag canary --no-git-tag",
29+
"release:snapshot": "changeset publish --tag snapshot --no-git-tag",
3030
"release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=1 npm run build && changeset publish --no-git-tag; fi",
3131
"test": "FORCE_COLOR=1 turbo test --concurrency=${TURBO_CONCURRENCY:-80%}",
3232
"test:cache:clear": "FORCE_COLOR=1 turbo test:cache:clear --continue --concurrency=${TURBO_CONCURRENCY:-80%}",

0 commit comments

Comments
 (0)