Merge pull request #2 from eWaterCycle/fetch-manifest-from-main-branch

Fetch manifest from main branch
eWaterCycle · Mar 5, 2021 · 1631b12 · 1631b12
2 parents 48aa633 + 409d4c3
commit 1631b12
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -3428,7 +3428,7 @@ const MANIFEST_REPO_OWNER = "eWaterCycle";
 const MANIFEST_REPO_NAME = "singularity-versions";
 function findReleaseFromManifest(semanticVersionSpec, architecture) {
     return __awaiter(this, void 0, void 0, function* () {
-        const manifest = yield tool_cache_1.getManifestFromRepo(MANIFEST_REPO_OWNER, MANIFEST_REPO_NAME, AUTH);
+        const manifest = yield tool_cache_1.getManifestFromRepo(MANIFEST_REPO_OWNER, MANIFEST_REPO_NAME, AUTH, 'main');
         return yield tool_cache_1.findFromManifest(semanticVersionSpec, true, manifest, architecture);
     });
 }
@@ -3484,6 +3484,7 @@ function main() {
                 core_1.info(`Successfully cached singularity to ${installDir}`);
             }
             else {
+                core_1.info(`Binary build of version ${versionSpec} is not available for downloading`);
                 installDir = yield installSingularityVersion(versionSpec);
             }
         }

diff --git a/src/index.ts b/src/index.ts
@@ -31,7 +31,8 @@ async function findReleaseFromManifest(
   const manifest: IToolRelease[] = await getManifestFromRepo(
     MANIFEST_REPO_OWNER,
     MANIFEST_REPO_NAME,
-    AUTH
+    AUTH,
+    "main"
   );
   return await findFromManifest(
     semanticVersionSpec,
@@ -98,6 +99,9 @@ async function main() {
       installDir = await cacheDir(extPath, "singularity", versionSpec);
       info(`Successfully cached singularity to ${installDir}`);
     } else {
+      info(
+        `Binary build of version ${versionSpec} is not available for downloading`
+      );
       installDir = await installSingularityVersion(versionSpec);
     }
   }