From e73dda54b6dc52cbe75ce97f248898a14ceebec9 Mon Sep 17 00:00:00 2001 From: "shopify-build-cli[bot]" <145388831+shopify-build-cli[bot]@users.noreply.github.com> Date: Wed, 18 Nov 2026 21:16:50 +0000 Subject: [PATCH] Update from World (5.0.0) Published by the World mirror. World-Commit: 2f15eada639d94bc98cf2534e210d20ab5ad4a2c --- CONTRIBUTING.md | 9 +++++---- bin/release | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bce78bc2ed8..45afc1df3b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,8 +61,9 @@ Before removing or incompatibly changing a stable interface: ## Releases and stable branches -- This repository is published from Shopify's internal monorepo. `main`'s version bump is made upstream with `pnpm changeset-manifests`, and the mirror carries it to GitHub: it opens or refreshes a pull request here automatically after each upstream merge, and merges it once `main`'s required checks pass. GitHub's `release.yml` then publishes as before. +- This repository is published from Shopify's internal monorepo. The mirror carries each upstream merge to GitHub: it opens or refreshes a pull request here automatically, and merges it once `main`'s required checks pass. GitHub `main` publishes only nightlies, never a release: on each push, its release workflow only checks that every version on `main` is on npm. +- Minor and patch releases ship from a `stable/X.Y` branch. Only Dev Experience members can create one: for a minor, a Dev Experience member creates it before the release, at a green `main` commit, with `git push origin :refs/heads/stable/X.Y`. That line's patches go to the same branch. +- `release.yml` pushes each version bump to `changeset-release/stable/X.Y`. GitHub Actions can't open pull requests here, so the release owner opens "Version Packages - stable/X.Y" from that branch, closes and reopens it to run its checks, and QAs its head commit with `release-qa-package.yml`. +- The release owner checks that `stable/X.Y` hasn't moved since the bump, then merges the pull request pinned to the QA'd commit: `gh pr merge --merge --admin --match-head-commit `. Use a merge commit (`--merge`): a squash merge publishes nothing. `release.yml` then publishes from `stable/X.Y` only the versions that the merge changed. After the release, the version bump is applied upstream, and the mirror carries it to `main`. - Never merge "Version Packages - main" on GitHub. It would put commits on GitHub `main` that the mirror didn't make, and the mirror would refuse every later publish. -- `stable/*` patch lines keep their own "Version Packages - stable/X.Y" pull requests on GitHub. GitHub Actions can't open them, so a Dev Experience member opens each one from `changeset-release/stable/X.Y`. -- Each `X.Y.0` release gets a `stable/X.Y` branch for its patch releases. Only Dev Experience members can create one: after the release, a Dev Experience member creates it from the release tag with `git push origin refs/tags/X.Y.0:refs/heads/stable/X.Y`. -- Changes to `stable/*` branches, such as patch-release backports and their "Version Packages" pull requests, go through a pull request that a Dev Experience member merges with the branch rules' bypass, with no review. +- Dev Experience members can push to and create `stable/*` branches without a pull request; force-pushes and deletion stay blocked. Other changes to `stable/*`, such as patch-release backports, go through a pull request that a Dev Experience member merges with the branch rules' bypass, with no review. While a release is open, only its release owner merges into `stable/X.Y`. diff --git a/bin/release b/bin/release index 8fba683734f..d44f61307af 100755 --- a/bin/release +++ b/bin/release @@ -26,10 +26,10 @@ pnpm bundle-for-release # Create a duplicate package for the CLI (to be deployed as just `shopify`) node bin/create-cli-duplicate-package.js -# Packages outside the fixed version group publish from main, under `latest`. A prerelease run -# would put their real version under the prerelease tag, and a stable line's run under -# stable-X.Y; npm then has that version, a later `latest` run skips it, and `latest` never points -# to it. They are marked private for this run, and `changeset publish` skips them. `shopify` is +# Packages outside the fixed version group publish only under `latest`, from the newest stable +# line's release. A prerelease run would put their real version under the prerelease tag, and an +# older line's run under stable-X.Y; npm then has that version, a later `latest` run skips it, and +# `latest` never points to it. They are marked private for this run, and `changeset publish` skips them. `shopify` is # the copy of @shopify/cli that bin/create-cli-duplicate-package.js makes in packages/cli-copy. if [ "$tag" != "latest" ]; then node -e '