Skip to content

address build-info crash on non-ember-source tags #21304

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
NullVoxPopuli merged 1 commit into from
Apr 8, 2026
Merged

address build-info crash on non-ember-source tags #21304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 3 deletions broccoli/build-info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ function buildGitInfo(root) {
function buildFromParts(packageVersion, gitInfo) {
let { tag, branch, sha } = gitInfo;
let shortSha = sha.slice(0, 8);
if (tag) {
let tagVersion = parseTagVersion(tag);
let tagVersion = tag ? parseTagVersion(tag) : null;
if (tag && tagVersion) {
Copy link
Copy Markdown
Contributor

@NullVoxPopuli NullVoxPopuli Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when we publish non-ember-source tags, we'll treat the commit as "main" -- which is fine and low-stakes enough for perf check

Copy link
Copy Markdown
Member

@kategengler kategengler Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just make build not run at all on non-ember-source tags?

Copy link
Copy Markdown
Contributor

@NullVoxPopuli NullVoxPopuli Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the git-repo-info dependency includes a tag for whatever commit happens to match main / current sha / most recent tag, iirc.

we probably don't need to use git-repo-info tbh. but I'd prefer to swap that out separately

return {
tag,
branch: null,
Expand Down Expand Up @@ -126,7 +126,8 @@ function readPackageVersion(root) {
*/
function parseTagVersion(tag) {
if (tag) {
return semver.parse(tag.replace(/-ember-source$/, '')).version;
let parsed = semver.parse(tag.replace(/-ember-source$/, ''));
return parsed ? parsed.version : null;
}
}

Expand Down
31 changes: 27 additions & 4 deletions tests/node/build-info-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@ QUnit.module('parseTagVersion', () => {
});
});

QUnit.test('parseTagVersion raises on non-semver tags', function (assert) {
assert.throws(() => {
parseTagVersion('some-non-version-tag');
});
QUnit.test('parseTagVersion returns null for non-semver tags', function (assert) {
assert.equal(parseTagVersion('some-non-version-tag'), null);
});

QUnit.test('parseTagVersion returns null for non-ember-source package tags', function (assert) {
assert.equal(parseTagVersion('v2.1.1-@glimmer/component'), null);
});
});

Expand Down Expand Up @@ -134,6 +136,27 @@ QUnit.module('buildFromParts', () => {
isBuildForTag: true,
},
},
{
args: [
'3.4.4', // Non-ember-source tag (e.g. @glimmer/component) should be treated as channel build
{
sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
branch: 'main',
tag: 'v2.1.1-@glimmer/component',
},
],
expected: {
tag: null,
branch: 'main',
sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
shortSha: 'f572d396',
channel: 'canary',
packageVersion: '3.4.4',
tagVersion: null,
version: '3.4.4-canary+f572d396',
isBuildForTag: false,
},
},
].forEach(({ args, expected }) => {
QUnit.test(JSON.stringify(args), function (assert) {
assert.deepEqual(buildFromParts(...args), expected);
Expand Down
Loading