From 6f17f14f97a6948b4101cbbf4dc2f335fcf992a9 Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Thu, 16 Jul 2026 18:17:20 +0300 Subject: [PATCH 1/5] chore(release): switch to npm trusted publishing --- .github/workflows/main.yaml | 15 ----------- .github/workflows/pr.yaml | 31 +--------------------- .github/workflows/release.yaml | 47 ++++++++++++++++++++++++++++++++++ package.json | 2 +- 4 files changed, 49 insertions(+), 46 deletions(-) delete mode 100644 .github/workflows/main.yaml create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml deleted file mode 100644 index 49ba2ca0..00000000 --- a/.github/workflows/main.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: CI -on: - push: - branches: - - main -jobs: - stable: - uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main - with: - releaseScript: release - nodeVersion: 21 - packageManager: "pnpm" - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 9e920f80..4d9e8a68 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,8 +1,7 @@ -name: PR +name: pr on: [pull_request] jobs: test: - name: Test runs-on: ubuntu-latest steps: - name: checkout @@ -22,7 +21,6 @@ jobs: run: pnpm test bench: - name: Benchmark runs-on: ubuntu-latest steps: - name: checkout @@ -38,30 +36,3 @@ jobs: run: pnpm install --frozen-lockfile - name: bench run: pnpm bench - - release_snapshot: - if: ${{ github.event.pull_request.title != 'Upcoming Release Changes' }} - name: Release snapshot - uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main - with: - npmTag: alpha - buildScript: build - nodeVersion: 20 - packageManager: pnpm - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} - - release_candidate: - uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main - name: Release candidate - if: ${{ github.event.pull_request.title == 'Upcoming Release Changes' }} - with: - npmTag: rc - restoreDeletedChangesets: true - buildScript: build - nodeVersion: 20 - packageManager: pnpm - secrets: - githubToken: ${{ secrets.GITHUB_TOKEN }} - npmToken: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 00000000..a74efa52 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,47 @@ +name: release +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: false + +on: + push: + branches: + - main + pull_request: + branches: + - main + +permissions: + id-token: write + pull-requests: write + actions: write + contents: write + +jobs: + stable: + if: github.event_name == 'push' + uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main + with: + releaseScript: release + buildScript: build + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + + snapshot: + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.title != 'Upcoming Release Changes' + uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main + with: + npmTag: alpha + buildScript: build + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} + + rc: + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.title == 'Upcoming Release Changes' + uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main + with: + npmTag: rc + restoreDeletedChangesets: true + buildScript: build + secrets: + githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 3728a602..9c504bd0 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "compose:debug": "DEBUG_COLORS=0 DEBUG=composition:* pnpm compose > guild.log", "compose:inspect": "tsx --inspect-brk --expose-gc ./compose.ts", "format": "prettier --write .", - "release": "pnpm build && changeset publish", + "release": "changeset publish", "test": "vitest --config ./vitest.config.js", "typecheck": "tsc --noEmit --project tsconfig.build.json" }, From 5a9a63d0a951bce2515a5855505a4dfc4dc0910e Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Thu, 16 Jul 2026 18:18:14 +0300 Subject: [PATCH 2/5] fix --- .github/workflows/pr.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4d9e8a68..e2242463 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -1,7 +1,8 @@ -name: pr +name: PR on: [pull_request] jobs: test: + name: Test runs-on: ubuntu-latest steps: - name: checkout @@ -21,6 +22,7 @@ jobs: run: pnpm test bench: + name: Benchmark runs-on: ubuntu-latest steps: - name: checkout From 6f8a33c1fe2516028eda1f76c55057ecc6080d5f Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Thu, 16 Jul 2026 18:19:03 +0300 Subject: [PATCH 3/5] fix --- .github/workflows/release.yaml | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a74efa52..182d51c6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,7 +23,6 @@ jobs: uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main with: releaseScript: release - buildScript: build secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json index 9c504bd0..3728a602 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "compose:debug": "DEBUG_COLORS=0 DEBUG=composition:* pnpm compose > guild.log", "compose:inspect": "tsx --inspect-brk --expose-gc ./compose.ts", "format": "prettier --write .", - "release": "changeset publish", + "release": "pnpm build && changeset publish", "test": "vitest --config ./vitest.config.js", "typecheck": "tsc --noEmit --project tsconfig.build.json" }, From 7bac8e5290658b093d4020245a00545573be460b Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Thu, 16 Jul 2026 18:19:53 +0300 Subject: [PATCH 4/5] fix --- .github/workflows/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 182d51c6..cbd7a318 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,6 +23,7 @@ jobs: uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main with: releaseScript: release + packageManager: pnpm secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -32,6 +33,7 @@ jobs: with: npmTag: alpha buildScript: build + packageManager: pnpm secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -42,5 +44,6 @@ jobs: npmTag: rc restoreDeletedChangesets: true buildScript: build + packageManager: pnpm secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} From ffbdb6d404fed874b65c8e550f57e5909c7d1321 Mon Sep 17 00:00:00 2001 From: Dotan Simha Date: Thu, 16 Jul 2026 18:20:19 +0300 Subject: [PATCH 5/5] fix --- .github/workflows/release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cbd7a318..660d1c23 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,6 +24,7 @@ jobs: with: releaseScript: release packageManager: pnpm + nodeVersion: 24 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -34,6 +35,7 @@ jobs: npmTag: alpha buildScript: build packageManager: pnpm + nodeVersion: 24 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -45,5 +47,6 @@ jobs: restoreDeletedChangesets: true buildScript: build packageManager: pnpm + nodeVersion: 24 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }}