Skip to content

fix(skills): stop pinning @next on release branches by name #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EtienneLescot merged 2 commits into from
Sep 10, 2026
Merged

fix(skills): stop pinning @next on release branches by name #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6bda75
fix(skills): stop pinning @next on release branches by name
EtienneLescot Sep 10, 2026
b420171
fix(skills): align the test dist-tag resolver with the -rc rule
EtienneLescot Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/skills/scripts/build-skill-adapters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,13 @@ function resolveAdapterDistTag() {
return 'next';
}

// The -rc/-next check above is the real prerelease signal. A release branch still
// carries stable versions until its RC bump lands, and its committed mirrors are
// main's stable payload, so pinning @next on the branch name alone made every push
// to release/** fail the committed-skills guard. Use build:adapters:branch when you
// explicitly want the next-channel payload.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
const branch = process.env.GITHUB_REF_NAME || process.env.BRANCH_NAME || readGitBranch();
return (branch === 'next' || branch?.startsWith('release/')) ? 'next' : undefined;
return branch === 'next' ? 'next' : undefined;
}

function readPackageVersion(packagePath) {
Expand Down
4 changes: 3 additions & 1 deletion packages/skills/tests/ai-context-generator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,9 @@ function resolveAdapterDistTag(repoRoot: string): string | undefined {
path.join(repoRoot, 'packages/skills/package.json'),
].map((packagePath) => JSON.parse(fs.readFileSync(packagePath, 'utf8')).version as string);

if (versions.some((version) => version.includes('-next'))) {
// ponytail: hand-copied from resolveAdapterDistTag in scripts/build-skill-adapters.js.
// It has already drifted twice; share one module if it drifts again.
if (versions.some((version) => version.includes('-next') || version.includes('-rc'))) {
return 'next';
}

Expand Down
Loading