Skip to content

Commit d484859

Browse files
committed
fix(release): normalize tag slugs without repeated suffix matching
1 parent 1e56cc8 commit d484859

4 files changed

Lines changed: 43 additions & 2 deletions

File tree

‎actions/release/prepare/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function versionFromTag(tag, directory, relativeDirectory) {
55
.basename(directory)
66
.toLowerCase()
77
.replace(/[^a-z0-9]+/g, "-")
8-
.replace(/^-+|-+$/g, "");
8+
.replace(/^-|-$/g, "");
99
const prefixes = ["", "v", ...(relativeDirectory ? [`${slug}-`] : [])];
1010
const version = prefixes
1111
.map((prefix) => (tag.startsWith(prefix) ? tag.slice(prefix.length) : ""))

‎actions/release/prepare/index.test.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,25 @@ test("finds drafts when the release-by-tag endpoint does not return them", async
281281
/Forbidden/,
282282
);
283283
});
284+
285+
test("nested project tags normalize directory punctuation and preserve stable versions", () => {
286+
const relativeDirectory = " ---My Package--- ";
287+
const directory = `/project/${relativeDirectory}`;
288+
for (const tag of ["1.2.3", "v1.2.3", "my-package-1.2.3"]) {
289+
assert.equal(
290+
releasePreparation.versionFromTag(tag, directory, relativeDirectory),
291+
"1.2.3",
292+
);
293+
}
294+
for (const tag of [
295+
"my-package-01.2.3",
296+
"my-package-1.2.3-beta",
297+
"wrong-1.2.3",
298+
]) {
299+
assert.throws(
300+
() =>
301+
releasePreparation.versionFromTag(tag, directory, relativeDirectory),
302+
/stable version tag/,
303+
);
304+
}
305+
});

‎actions/release/verify/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function versionFromTag(tag, directory, relativeDirectory) {
55
.basename(directory)
66
.toLowerCase()
77
.replace(/[^a-z0-9]+/g, "-")
8-
.replace(/^-+|-+$/g, "");
8+
.replace(/^-|-$/g, "");
99
const prefixes = ["", "v", ...(relativeDirectory ? [`${slug}-`] : [])];
1010
const version = prefixes
1111
.map((prefix) => (tag.startsWith(prefix) ? tag.slice(prefix.length) : ""))

‎actions/release/verify/index.test.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,3 +152,22 @@ test("rejects ambiguous names, unsafe paths, mismatched versions and invalid pac
152152
);
153153
}
154154
});
155+
156+
test("verifies tags derived from nested project directories containing punctuation", async () => {
157+
const tag = "my-package-1.2.3";
158+
const releases = await releaseVerification.verifyReleases({
159+
context: { ...context, workspace: "/tmp/project", ref: `refs/tags/${tag}` },
160+
packages: [{ ...item, tag }],
161+
workingDirectory: " ---My Package--- ",
162+
github: {
163+
rest: {
164+
repos: {
165+
getCommit: async () => ({ data: { sha: context.sha } }),
166+
getReleaseByTag: async () => ({ data: { draft: true } }),
167+
},
168+
},
169+
},
170+
});
171+
assert.equal(releases[0].tag, tag);
172+
assert.equal(releases[0].published, false);
173+
});

0 commit comments

Comments
 (0)