Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/tasks/createGithubRelease/getNextGitTag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ export function getNextGitTag(releaseDetailsMap: GitTagDetailsMap, isMultiVarian
if (variantVersions.length === 0)
throw Error("Could not generate git tag. Missing variant or nextVersion");

// If not multi-variant and only one variant, return v<version>
if (variantVersions.length === 1 && !isMultiVariant)
return `v${variantVersions[0].nextVersion}`;

// If any variant is null, throw an error
if (variantVersions.some(({ variant }) => !variant))
throw Error("Could not generate git tag. Missing variant");
Expand All @@ -39,9 +43,6 @@ export function getNextGitTag(releaseDetailsMap: GitTagDetailsMap, isMultiVarian
.join("_");
}

// Not a multi-variant package
if (variantVersions.length === 1) return `v${variantVersions[0].nextVersion}`;

// Multi-variant package (fallback, should not hit if isMultiVariant is set correctly)
return variantVersions
.sort((a, b) => (a.variant || "").localeCompare(b.variant || ""))
Expand Down
20 changes: 20 additions & 0 deletions test/tasks/gitTags.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,26 @@ describe("getNextGitTag", () => {
expect(result).to.equal("v0.1.2");
});

it("should not throw an error if single variant is missing (not multi-variant)", () => {
const ctx = {
"geth.dnp.dapnode.eth": {
variant: null,
nextVersion: "0.1.2"
}
};
expect(() => getNextGitTag(ctx, false)).to.not.throw()
});

it("should throw an error if single variant is missing (multi-variant)", () => {
const ctx = {
"geth.dnp.dapnode.eth": {
variant: null,
nextVersion: "0.1.2"
}
};
expect(() => getNextGitTag(ctx, true)).to.throw("Could not generate git tag. Missing variant");
});

it("should format a single-variant package as variant@v<version> if isMultiVariant is true", () => {
const ctx = {
"gnosis.dnp.dapnode.eth": {
Expand Down
Loading