Fix git tag generation (#445)

dappnode · Jul 25, 2024 · 2fe63b0 · 2fe63b0
1 parent d1e7d08
commit 2fe63b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/tasks/createGithubRelease/buildReleaseDetailsMap.ts b/src/tasks/createGithubRelease/buildReleaseDetailsMap.ts
@@ -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] = {

diff --git a/src/tasks/createGithubRelease/getNextGitTag.ts b/src/tasks/createGithubRelease/getNextGitTag.ts
@@ -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
 }
diff --git a/src/tasks/createGithubRelease/types.ts b/src/tasks/createGithubRelease/types.ts
@@ -6,6 +6,6 @@ export interface ReleaseDetailsMap {
     releaseMultiHash: string;
     txData: TxData;
     releaseDir: string;
-    variant: string;
+    variant: string | null;
   };
 }