From a0e41bed7f5c9c226ed40bce8f0c3e1b5f0ed1cf Mon Sep 17 00:00:00 2001 From: Damir Shamanaev Date: Mon, 13 May 2024 13:47:29 +0100 Subject: [PATCH 1/6] adds .tgz to the list --- src/main.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.ts b/src/main.ts index 597b3b6c..0d170bcf 100644 --- a/src/main.ts +++ b/src/main.ts @@ -134,7 +134,7 @@ async function run() { osArch: osArch, osPlatform: osPlatform }; - + let dest = toolPath(toolInfo); // If the user has specified a custom location where the binaries are in the release // asset, we need to use modify the default path, joining the custom folder to the @@ -334,7 +334,7 @@ function getCacheDirectory() { } function getExtractFn(assetName: any) { - if (assetName.endsWith('.tar.gz') || assetName.endsWith('.tar.bz2')) { + if (assetName.endsWith('.tar.gz') || assetName.endsWith('.tar.bz2') || assetName.endsWith('.tgz')) { return tc.extractTar; } else if (assetName.endsWith('.zip')) { return tc.extractZip; From 067e2c5d73164069a25c4a1cd8737698abea56fb Mon Sep 17 00:00:00 2001 From: Damir Shamanaev Date: Fri, 17 May 2024 13:51:01 +0300 Subject: [PATCH 2/6] adds test for sui --- .github/workflows/test.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 33d4db0c..c24bd0fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -190,3 +190,20 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: promtool --version + sui: + strategy: + matrix: + version: [ "latest" ] + runs-on: [ "ubuntu-latest" ] + runs-on: ${{ matrix.runs-on }} + steps: + - uses: actions/checkout@v1 + - run: npm ci + - run: npm run build + - uses: ./ + with: + repo: MystenLabs/sui + platform: ubuntu + cache: enable + extension: '.tgz' + - run: sui --version From d167f248f1de478152deacc2bc9ed3efb61390df Mon Sep 17 00:00:00 2001 From: Damir Shamanaev Date: Fri, 17 May 2024 14:17:10 +0300 Subject: [PATCH 3/6] adds tgz to search regexp --- .github/workflows/test.yml | 1 - lib/main.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c24bd0fc..de0802a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -205,5 +205,4 @@ jobs: repo: MystenLabs/sui platform: ubuntu cache: enable - extension: '.tgz' - run: sui --version diff --git a/lib/main.js b/lib/main.js index 24f67425..549e858c 100644 --- a/lib/main.js +++ b/lib/main.js @@ -114,7 +114,7 @@ function run() { let extMatchRegexForm = ""; if (extMatching) { if (extension === "") { - extMatchRegexForm = "\.(tar.gz|zip)"; + extMatchRegexForm = "\.(tar.gz|zip|tgz)"; core.info(`==> Using default file extension matching: ${extMatchRegexForm}`); } else { From 4080b6026a3642ba7039afd15f319af53c9570a8 Mon Sep 17 00:00:00 2001 From: Damir Shamanaev Date: Fri, 17 May 2024 14:22:15 +0300 Subject: [PATCH 4/6] try change extension matching --- lib/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 549e858c..248bd548 100644 --- a/lib/main.js +++ b/lib/main.js @@ -114,7 +114,7 @@ function run() { let extMatchRegexForm = ""; if (extMatching) { if (extension === "") { - extMatchRegexForm = "\.(tar.gz|zip|tgz)"; + extMatchRegexForm = "\.(tar.gz|zip|tgz|jjj)"; core.info(`==> Using default file extension matching: ${extMatchRegexForm}`); } else { From bfafe5b0caddde5e0225d450402866f94efee489 Mon Sep 17 00:00:00 2001 From: Damir Shamanaev Date: Fri, 17 May 2024 14:23:33 +0300 Subject: [PATCH 5/6] Revert "try change extension matching" This reverts commit 4080b6026a3642ba7039afd15f319af53c9570a8. --- lib/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.js b/lib/main.js index 248bd548..549e858c 100644 --- a/lib/main.js +++ b/lib/main.js @@ -114,7 +114,7 @@ function run() { let extMatchRegexForm = ""; if (extMatching) { if (extension === "") { - extMatchRegexForm = "\.(tar.gz|zip|tgz|jjj)"; + extMatchRegexForm = "\.(tar.gz|zip|tgz)"; core.info(`==> Using default file extension matching: ${extMatchRegexForm}`); } else { From b02c8b7de6320c2bbaba77ac69e5b4cd27152cb8 Mon Sep 17 00:00:00 2001 From: Damir Shamanaev Date: Fri, 17 May 2024 14:24:27 +0300 Subject: [PATCH 6/6] was patching the wrong file --- src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index 0d170bcf..9fc07764 100644 --- a/src/main.ts +++ b/src/main.ts @@ -107,7 +107,7 @@ async function run() { let extMatchRegexForm = ""; if (extMatching) { if (extension === "") { - extMatchRegexForm = "\.(tar.gz|zip)"; + extMatchRegexForm = "\.(tar.gz|zip|tgz)"; core.info(`==> Using default file extension matching: ${extMatchRegexForm}`); } else { extMatchRegexForm = extension;