Skip to content

The Open Standard for Generative UI

ci: fix release PR creation and CLI e2e pnpm matrix (#1158)

abhithesys36f551ed7312
diff --git a/.github/workflows/cli-e2e.yml b/.github/workflows/cli-e2e.yml
index 8f6e69ff5..87383e96e 100644
--- a/.github/workflows/cli-e2e.yml
+++ b/.github/workflows/cli-e2e.yml
@@ -160,9 +160,19 @@ jobs:
if: matrix.package-manager == 'pnpm'
with:
version: ${{ matrix.package-manager-version }}
+ # The matrix version must win here; reading the repo root's
+ # packageManager field ([email protected]) alongside an explicit version
+ # is a hard error in action-setup v6, so point it at a manifest
+ # without that field.
+ package_json_file: packages/openui-cli/package.json
- name: Verify package manager version
shell: bash
+ # Outside the repo checkout: inside it, pnpm >=10 self-switches to the
+ # root packageManager version ([email protected]) and would report that
+ # instead of the matrix-installed version. The e2e steps below all run
+ # under runner.temp too, so this verifies what they will actually use.
+ working-directory: ${{ runner.temp }}
env:
PACKAGE_MANAGER: ${{ matrix.package-manager }}
EXPECTED_MAJOR: ${{ matrix.package-manager-version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dbdc5b512..9a5393bb5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,18 +7,31 @@ on:
concurrency: release
permissions:
- contents: write # push the changeset-release branch, create tags + GitHub Releases
- pull-requests: write # maintain the Version Packages PR
+ contents: read # checkout only; push/PR/release rights come from the app token
id-token: write # npm OIDC trusted publishing
jobs:
release:
runs-on: ubuntu-latest
steps:
+ # Branch pushes, the Version Packages PR, tags, and GitHub Releases are
+ # made with a GitHub App token instead of GITHUB_TOKEN: GITHUB_TOKEN is
+ # not permitted to create PRs in this org, and app-made pushes and PRs
+ # trigger workflows, so the Version PR gets normal CI. The app needs
+ # Contents + Pull requests read/write on this repo.
+ - name: Mint app token
+ id: app-token
+ uses: actions/create-github-app-token@v2
+ with:
+ app-id: ${{ vars.THESYS_PR_CREATOR_APP_ID }}
+ private-key: ${{ secrets.THESYS_PR_CREATOR_PRIVATE_KEY }}
+
- uses: actions/checkout@v4
with:
# Full history: @changesets/changelog-github links commits/PRs
fetch-depth: 0
+ # Persist the app token so the action's branch pushes use the app identity
+ token: ${{ steps.app-token.outputs.token }}
- uses: pnpm/action-setup@v6
- uses: actions/setup-node@v4
with:
@@ -47,11 +60,11 @@ jobs:
create-github-releases: true
pr-title: "chore: version packages"
commit-message: "chore: version packages"
+ # PR creation, tags, and GitHub Releases act as the app
+ github-token: ${{ steps.app-token.outputs.token }}
env:
- # GITHUB_TOKEN-pushed branches trigger no workflows: the Version
- # Packages PR runs zero CI. Swap in a PAT/GitHub App token here if
- # CI on that PR (or required status checks on main) is needed.
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ # For @changesets/changelog-github's PR/commit lookups in version-script
+ GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
# Same build-memory headroom as build-js.yml
NODE_OPTIONS: --max-old-space-size=6144
# Note: npm provenance is generated automatically with trusted