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
2 changes: 1 addition & 1 deletion src/tasks/createGithubRelease/buildReleaseDetailsMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function buildReleaseDetailsMap(
dnpName,
{ nextVersion, releaseMultiHash, txData, releaseDir, variant }
] of Object.entries(ctx)) {
if (!nextVersion || !releaseMultiHash || !txData || !releaseDir || !variant)
if (!nextVersion || !releaseMultiHash || !txData || !releaseDir)
throw new Error(`Missing required release details for ${dnpName}`);

releaseDetailsMap[dnpName] = {
Expand Down
6 changes: 5 additions & 1 deletion src/tasks/createGithubRelease/getNextGitTag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@ export function getNextGitTag(releaseDetailsMap: GitTagDetailsMap): string {
// Not a multi-variant package
if (variantVersions.length === 1) 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");

// Multi-variant package
return variantVersions
.sort((a, b) => a.variant.localeCompare(b.variant)) // Sort alphabetically by variant
.sort((a, b) => (a.variant || "").localeCompare(b.variant || "")) // Sort alphabetically by variant
.map(({ variant, nextVersion }) => `${variant}@${nextVersion}`) // Map to string
.join("_"); // Join into a single string
}
2 changes: 1 addition & 1 deletion src/tasks/createGithubRelease/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ export interface ReleaseDetailsMap {
releaseMultiHash: string;
txData: TxData;
releaseDir: string;
variant: string;
variant: string | null;
};
}