Use isMultivariants from cli args

dappnode · Aug 6, 2024 · 010521f · 010521f
1 parent 037e50b
commit 010521f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 10 deletions.
diff --git a/src/commands/publish/handler.ts b/src/commands/publish/handler.ts
@@ -63,6 +63,8 @@ export async function publishHandler({
 
   const variantsDirPath = path.join(dir, variantsDirName);
 
+  const isMultiVariant = !!allVariants || !!variants;
+
   const publishTasks = new Listr(
     publish({
       releaseType,
@@ -84,7 +86,8 @@ export async function publishHandler({
         rootDir: dir,
         variantsDirPath,
         composeFileName
-      })
+      }),
+      isMultiVariant
     }),
     verbosityOptions
   );

diff --git a/src/tasks/createGithubRelease/index.ts b/src/tasks/createGithubRelease/index.ts
@@ -12,9 +12,11 @@ import { getCreateReleaseTask } from "./subtasks/getCreateReleaseTask.js";
 export function createGithubRelease({
   dir: rootDir = defaultDir,
   compose_file_name: composeFileName,
-  verbosityOptions
+  verbosityOptions,
+  isMultiVariant
 }: {
   verbosityOptions: VerbosityOptions;
+  isMultiVariant: boolean;
 } & CliGlobalOptions): Listr<ListrContextPublish> {
   // OAuth2 token from Github
   if (!process.env.GITHUB_TOKEN)
@@ -27,7 +29,8 @@ export function createGithubRelease({
       getHandleTagsTask({ github }),
       getCreateReleaseTask({
         github,
-        composeFileName
+        composeFileName,
+        isMultiVariant
       })
     ],
     verbosityOptions

diff --git a/src/tasks/createGithubRelease/subtasks/getCreateReleaseTask.ts b/src/tasks/createGithubRelease/subtasks/getCreateReleaseTask.ts
@@ -20,10 +20,12 @@ import { compactManifestIfCore, composeDeleteBuildProperties } from "../../../fi
  */
 export function getCreateReleaseTask({
   github,
-  composeFileName
+  composeFileName,
+  isMultiVariant
 }: {
   github: Github;
   composeFileName?: string;
+  isMultiVariant: boolean;
 }): ListrTask<ListrContextPublish> {
   return {
     title: `Create release`,
@@ -45,7 +47,7 @@ export function getCreateReleaseTask({
       prepareGithubReleaseFiles({ releaseDetailsMap, composeFileName });
 
       task.output = "Uploading assets...";
-      await uploadAssets({ releaseDetailsMap, github, releaseId });
+      await uploadAssets({ releaseDetailsMap, github, releaseId, isMultiVariant });
 
     }
   };
@@ -84,13 +86,14 @@ function prepareGithubReleaseFiles({
 async function uploadAssets({
   releaseDetailsMap,
   github,
-  releaseId
+  releaseId,
+  isMultiVariant
 }: {
   releaseDetailsMap: ReleaseDetailsMap;
   github: Github;
   releaseId: number;
+  isMultiVariant: boolean;
 }) {
-  const isMultiVariant = Object.keys(releaseDetailsMap).length > 1;
   const releaseEntries = Object.entries(releaseDetailsMap);
   const [, { releaseDir: firstReleaseDir }] = releaseEntries[0];
 

diff --git a/src/tasks/publish/index.ts b/src/tasks/publish/index.ts
@@ -23,6 +23,7 @@ export function publish({
   verbosityOptions,
   variantsDirPath,
   packagesToBuildProps,
+  isMultiVariant
 }: PublishOptions): ListrTask<ListrContextPublish>[] {
   return [
     getVerifyEthConnectionTask({ ethProvider }),
@@ -63,7 +64,8 @@ export function publish({
       dir,
       githubRelease: Boolean(githubRelease),
       verbosityOptions,
-      composeFileName
+      composeFileName,
+      isMultiVariant
     })
   ];
 }
diff --git a/src/tasks/publish/subtasks/getCreateGithubReleaseTask.ts b/src/tasks/publish/subtasks/getCreateGithubReleaseTask.ts
@@ -7,12 +7,14 @@ export function getCreateGithubReleaseTask({
   githubRelease,
   dir,
   composeFileName,
-  verbosityOptions
+  verbosityOptions,
+  isMultiVariant
 }: {
   githubRelease: boolean;
   dir: string;
   composeFileName: string;
   verbosityOptions: VerbosityOptions;
+  isMultiVariant: boolean;
 }): ListrTask<ListrContextPublish> {
   return {
     title: "Release on github",
@@ -21,7 +23,8 @@ export function getCreateGithubReleaseTask({
       createGithubRelease({
         dir,
         compose_file_name: composeFileName,
-        verbosityOptions
+        verbosityOptions,
+        isMultiVariant
       })
   };
 }
diff --git a/src/tasks/publish/types.ts b/src/tasks/publish/types.ts
@@ -17,4 +17,5 @@ export interface PublishOptions {
   verbosityOptions: VerbosityOptions;
   variantsDirPath: string;
   packagesToBuildProps: PackageToBuildProps[];
+  isMultiVariant: boolean;
 }