From ef22cb9fcd3ecf48fac7cb482d44eafa62823c92 Mon Sep 17 00:00:00 2001
From: Mark Sinclair <mmsinclair@users.noreply.github.com>
Date: Wed, 20 Mar 2024 17:55:17 +0000
Subject: [PATCH] GitHub Actions: nym-hash-release

---
 .github/actions/nym-hash-releases/dist/index.js     | 13 +++++++------
 .../actions/nym-hash-releases/src/create-hashes.mjs |  3 ++-
 .github/actions/nym-hash-releases/src/run-local.mjs | 13 +++++++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.github/actions/nym-hash-releases/dist/index.js b/.github/actions/nym-hash-releases/dist/index.js
index 6759b28f93..9d1c0ec1e0 100644
--- a/.github/actions/nym-hash-releases/dist/index.js
+++ b/.github/actions/nym-hash-releases/dist/index.js
@@ -24002,7 +24002,7 @@ async function run(assets, algorithm, filename, cache) {
             let sig = null;
 
             // cache in `${WORKING_DIR}/.tmp/`
-            const cacheFilename = external_path_.resolve(`.tmp/${asset.name}`);
+            const cacheFilename = __nccwpck_require__.ab + ".tmp/" + asset.name;
             if(!external_fs_.existsSync(cacheFilename)) {
                 console.log(`Downloading ${asset.browser_download_url}... to ${cacheFilename}`);
                 buffer = Buffer.from(await fetch(asset.browser_download_url).then(res => res.arrayBuffer()));
@@ -24122,8 +24122,8 @@ async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algo
 
     let releases;
     if(cache) {
-        const cacheFilename = external_path_.resolve(`.tmp/releases.json`);
-        if(!external_fs_.existsSync(cacheFilename)) {
+        const cacheFilename = __nccwpck_require__.ab + "releases.json";
+        if(!external_fs_.existsSync(__nccwpck_require__.ab + "releases.json")) {
             releases = await octokit.paginate(
                 octokit.rest.repos.listReleases,
                 {
@@ -24133,10 +24133,10 @@ async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algo
                 },
                 (response) => response.data
             );
-            external_fs_.writeFileSync(cacheFilename, JSON.stringify(releases, null, 2));
+            external_fs_.writeFileSync(__nccwpck_require__.ab + "releases.json", JSON.stringify(releases, null, 2));
         } else {
             console.log('Loading releases from cache...');
-            releases = JSON.parse(external_fs_.readFileSync(cacheFilename));
+            releases = JSON.parse(external_fs_.readFileSync(__nccwpck_require__.ab + "releases.json"));
         }
     } else {
         releases = await octokit.paginate(
@@ -24172,9 +24172,10 @@ async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrId, algo
 
     releasesToProcess.forEach(release => {
         const {tag_name, name} = release;
-        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+\.\S+)/);
+        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+(\.\S+)?)/);
 
         if(!matches || matches.length < 2) {
+            console.warn('Could not match version structure in tag name = ', tag_name);
             return;
         }
 
diff --git a/.github/actions/nym-hash-releases/src/create-hashes.mjs b/.github/actions/nym-hash-releases/src/create-hashes.mjs
index 584d364a4c..410910f08a 100644
--- a/.github/actions/nym-hash-releases/src/create-hashes.mjs
+++ b/.github/actions/nym-hash-releases/src/create-hashes.mjs
@@ -210,9 +210,10 @@ export async function createHashesFromReleaseTagOrNameOrId({ releaseTagOrNameOrI
 
     releasesToProcess.forEach(release => {
         const {tag_name, name} = release;
-        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+\.\S+)/);
+        const matches = tag_name.match(/(\S+)-v([0-9]+\.[0-9]+(\.\S+)?)/);
 
         if(!matches || matches.length < 2) {
+            console.warn('Could not match version structure in tag name = ', tag_name);
             return;
         }
 
diff --git a/.github/actions/nym-hash-releases/src/run-local.mjs b/.github/actions/nym-hash-releases/src/run-local.mjs
index f2fc6addb8..f0998580ae 100644
--- a/.github/actions/nym-hash-releases/src/run-local.mjs
+++ b/.github/actions/nym-hash-releases/src/run-local.mjs
@@ -1,6 +1,11 @@
 import {createHashesFromReleaseTagOrNameOrId} from './create-hashes.mjs';
 
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 119065724, cache: true, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: '119065724', cache: true, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-connect-v1.1.19-snickers', cache: true, upload: false});
-await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'Nym Connect v1.1.19-snickers', cache: true, upload: false});
+const cache = true;
+
+await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-binaries-v2024.1-marabou', cache, upload: false});
+await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-vpn-desktop-v0.0.8', cache, upload: false, repo: 'nym-vpn-client'});
+
+// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 119065724, cache: true, upload: false});
+// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: '119065724', cache: true, upload: false});
+// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'nym-connect-v1.1.19-snickers', cache: true, upload: false});
+// await createHashesFromReleaseTagOrNameOrId({releaseTagOrNameOrId: 'Nym Connect v1.1.19-snickers', cache: true, upload: false});