Skip to content

Commit 2b1f9d1

Browse files
authored
ci(repo): configure main branch for core 3 canary releases (#7405)
1 parent 1ce671d commit 2b1f9d1

File tree

4 files changed

+19
-108
lines changed

4 files changed

+19
-108
lines changed

.github/workflows/release-canary-core-3.yml

Lines changed: 0 additions & 77 deletions
This file was deleted.

.github/workflows/release-canary.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run-name: Canary release from ${{ github.ref_name }}
44
on:
55
push:
66
branches:
7-
- main-disabled
7+
- main
88

99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref }}
@@ -56,6 +56,7 @@ jobs:
5656
NPM_CONFIG_PROVENANCE: true
5757

5858
- name: Trigger workflows on related repos
59+
if: steps.version-packages.outputs.success == '1'
5960
uses: actions/github-script@v7
6061
with:
6162
result-encoding: string
@@ -64,15 +65,16 @@ jobs:
6465
github-token: ${{ secrets.CLERK_COOKIE_PAT }}
6566
script: |
6667
const clerkjsVersion = require('./packages/clerk-js/package.json').version;
68+
const clerkUiVersion = require('./packages/ui/package.json').version;
6769
const nextjsVersion = require('./packages/nextjs/package.json').version;
6870
69-
github.rest.actions.createWorkflowDispatch({
70-
owner: 'clerk',
71-
repo: 'sdk-infra-workers',
72-
workflow_id: 'update-pkg-versions.yml',
73-
ref: 'main',
74-
inputs: { clerkjsVersion: clerkjsVersion }
75-
})
71+
github.rest.actions.createWorkflowDispatch({
72+
owner: 'clerk',
73+
repo: 'sdk-infra-workers',
74+
workflow_id: 'update-pkg-versions.yml',
75+
ref: 'main',
76+
inputs: { clerkjsVersion, clerkUiVersion }
77+
})
7678
7779
if (nextjsVersion.includes('canary')) {
7880
console.log('clerk/nextjs changed, will notify clerk/accounts');

.github/workflows/release.yml

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ run-name: Release
44
on:
55
push:
66
branches:
7-
- main-disabled
8-
- release/v4-disabled
7+
- main
98

109
concurrency:
1110
group: ${{ github.workflow }}-${{ github.ref }}
@@ -39,30 +38,21 @@ jobs:
3938
fetch-depth: 0
4039
show-progress: false
4140

42-
- name: Safety check - Prevent production releases on canary-core3 branch
43-
run: |
44-
if [ -f ".canary-core3-branch" ]; then
45-
echo "❌ ERROR: This branch is marked for canary-core3 releases only!"
46-
echo "Production releases (latest tag) are not allowed on this branch."
47-
echo "If you need to make a production release, use the main production branch."
48-
exit 1
49-
fi
50-
5141
- name: Setup
5242
id: config
5343
uses: ./.github/actions/init
5444
with:
55-
turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
56-
turbo-team: ${{ vars.TURBO_TEAM }}
57-
turbo-token: ${{ secrets.TURBO_TOKEN }}
5845
playwright-enabled: true # Must be present to enable caching on branched workflows
46+
# turbo-signature: ${{ secrets.TURBO_REMOTE_CACHE_SIGNATURE_KEY }}
47+
# turbo-team: ${{ vars.TURBO_TEAM }}
48+
# turbo-token: ${{ secrets.TURBO_TOKEN }}
5949

6050
- name: Create Release PR
6151
id: changesets
6252
uses: changesets/action@v1
6353
with:
64-
commit: "ci(repo): Version packages"
65-
title: "ci(repo): Version packages"
54+
commit: "ci(repo): Version packages (Core 3)"
55+
title: "ci(repo): Version packages (Core 3)"
6656
publish: pnpm turbo build $TURBO_ARGS --force && pnpm release
6757
# Workaround for https://github.com/changesets/changesets/issues/421
6858
version: pnpm version-packages
@@ -84,14 +74,15 @@ jobs:
8474
const preMode = require("fs").existsSync("./.changeset/pre.json");
8575
if (!preMode) {
8676
const clerkjsVersion = require('./packages/clerk-js/package.json').version;
77+
const clerkUiVersion = require('./packages/ui/package.json').version;
8778
const nextjsVersion = require('./packages/nextjs/package.json').version;
8879
8980
github.rest.actions.createWorkflowDispatch({
9081
owner: 'clerk',
9182
repo: 'sdk-infra-workers',
9283
workflow_id: 'update-pkg-versions.yml',
9384
ref: 'main',
94-
inputs: { clerkjsVersion }
85+
inputs: { clerkjsVersion, clerkUiVersion }
9586
})
9687
9788
github.rest.actions.createWorkflowDispatch({
@@ -100,7 +91,7 @@ jobs:
10091
workflow_id: 'prepare-nextjs-sdk-update.yml',
10192
ref: 'main',
10293
inputs: { version: nextjsVersion }
103-
})
94+
})
10495
10596
github.rest.actions.createWorkflowDispatch({
10697
owner: 'clerk',

canary-core3-branch

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)