Skip to content

Conversation

@shopify-github-actions-access
Copy link
Contributor

@shopify-github-actions-access shopify-github-actions-access bot commented Oct 1, 2025

@shopify/cli-hydrogen@11.1.5
@shopify/create-hydrogen@5.0.26

For skeleton at @shopify/cli@3.85.4 / @shopify/cli-hydrogen@11.1.4

@shopify-github-actions-access shopify-github-actions-access bot requested a review from a team as a code owner October 1, 2025 00:12
@shopify
Copy link
Contributor

shopify bot commented Oct 1, 2025

Oxygen deployed a preview of your changeset-release/main branch. Details:

Storefront Status Preview link Deployment details Last update (UTC)
Skeleton (skeleton.hydrogen.shop) ✅ Successful (Logs) Preview deployment Inspect deployment October 1, 202512:20 AM
custom-cart-method ✅ Successful (Logs) Preview deployment Inspect deployment October 1, 202512:15 AM
classic-remix ✅ Successful (Logs) Preview deployment Inspect deployment October 1, 202512:12 AM
metaobjects ✅ Successful (Logs) Preview deployment Inspect deployment October 1, 202512:15 AM
third-party-queries-caching ✅ Successful (Logs) Preview deployment Inspect deployment October 1, 202512:15 AM
sitemap ✅ Successful (Logs) Preview deployment Inspect deployment October 1, 202512:15 AM

Learn more about Hydrogen's GitHub integration.

@juanpprieto juanpprieto changed the title [ci] release 2025.7.1 [ci] release semver Oct 1, 2025
@juanpprieto juanpprieto force-pushed the changeset-release/main branch from ba27fb4 to f665cf2 Compare October 1, 2025 00:17
@juanpprieto juanpprieto merged commit 7b5caa9 into main Oct 1, 2025
13 checks passed
@juanpprieto juanpprieto deleted the changeset-release/main branch October 1, 2025 00:28
juanpprieto added a commit that referenced this pull request Oct 1, 2025
Previously, enforce-calver-ci.js would unconditionally run for all CalVer
packages (hydrogen, hydrogen-react, skeleton) even when only semver packages
(cli, mini-oxygen, create-hydrogen) had changesets. This caused phantom
version bumps and CHANGELOG entries for CalVer packages with no actual changes.

The fix adds an early exit check that skips CalVer enforcement when no CalVer
changesets are detected, ensuring semver-only releases don't touch CalVer packages.

Fixes the issue seen in PR #3233 where a CLI-only release incorrectly bumped
hydrogen/hydrogen-react/skeleton.
juanpprieto added a commit that referenced this pull request Oct 2, 2025
* Fix CalVer enforcement running on semver-only releases

Previously, enforce-calver-ci.js would unconditionally run for all CalVer
packages (hydrogen, hydrogen-react, skeleton) even when only semver packages
(cli, mini-oxygen, create-hydrogen) had changesets. This caused phantom
version bumps and CHANGELOG entries for CalVer packages with no actual changes.

The fix adds an early exit check that skips CalVer enforcement when no CalVer
changesets are detected, ensuring semver-only releases don't touch CalVer packages.

Fixes the issue seen in PR #3233 where a CLI-only release incorrectly bumped
hydrogen/hydrogen-react/skeleton.

* Document semver-only release guard check in CALVER.md

* Fix CalVer enforcement guard check to compare version changes

The guard check was using hasCalVerChangesets() which checks for .md files
in .changeset/ directory. But this runs AFTER 'changeset version' has already
deleted those files, causing the check to always return false and skip
enforcement for ALL releases (including CalVer releases).

Fix: Compare actual version changes by checking if pkg.version differs from
git baseline (oldVersion). This correctly:
- Skips when only semver packages change (no CalVer version changes)
- Runs when any CalVer package version changes
- Works regardless of whether changeset files still exist

The readPackageVersions() function already provides both values for comparison.

* Fix CalVer guard check and dynamic Test 5

enforce-calver-ci.js: Compare version changes instead of checking deleted changeset files
test-calver.yml: Calculate expected branches from actual hydrogen version instead of hardcoding 2025-05

* Implement independent patches with synced majors

Patches/minors: Each CalVer package uses its own git baseline for independent versioning
Majors: All CalVer packages sync to same quarter using hydrogen's baseline

This allows hydrogen, hydrogen-react, and skeleton to have different patch versions
while ensuring all majors stay synchronized to the same quarter.

* Skip unchanged CalVer packages in patch releases

When calculating new versions, preserve unchanged packages instead of bumping them.
This enables truly independent patch versioning while maintaining major sync.

* Add Test 8: Full pipeline integration test

Tests complete version script flow for:
- Semver-only releases (validates guard check skips CalVer enforcement)
- CalVer releases (validates enforcement runs and version.ts updates)

This catches regressions in the full pipeline, not just isolated scripts.

* Document independent patches and synced majors in CALVER.md

CalVer packages now support:
- Independent patch/minor versions (hydrogen@2025.7.2, react@2025.7.0)
- Synchronized major versions (all at 2025.10.0 for Q4)

* Add test changeset for semver-only release validation

Creates a dummy patch changeset for cli-hydrogen to validate that:
- Version PR is titled "[ci] release semver" (not CalVer date)
- Only cli-hydrogen is bumped (no CalVer packages touched)
- enforce-calver-ci.js correctly skips CalVer enforcement
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants