feat: added extraction retry

mun-lang · Jan 22, 2021 · 9f8be24 · 9f8be24
1 parent e2c9082
commit 9f8be24
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 20 deletions.
diff --git a/.github/actions/install-llvm/dist/index.js b/.github/actions/install-llvm/dist/index.js
@@ -1195,18 +1195,28 @@ async function execute(cmd) {
             core.info("Succesfully downloaded LLVM release, extracting...")
             const llvmPath = path.resolve("llvm");
             const _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
-            const args = [
-                "-bsp1", // output log info
-                "x", // extract
-                downloadLocation,
-                `-o${llvmPath}`
-            ]
-            const exit = await exec.exec(_7zPath, args);
-            if(exit !== 0) {
-                throw new Error("Could not extract LLVM and Clang binaries.");
+            let attempt = 1;
+            while(true) {
+                const args = [
+                    "x", // extract
+                    downloadLocation,
+                    `-o${llvmPath}`
+                ]
+                const exit = await exec.exec(_7zPath, args);
+                if(exit === 2 && attempt <= 4) {
+                    attempt += 1;
+                    console.error(`Error extracting LLVM release, retrying attempt #${attempt} after 1s..`)
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                }
+                else if (exit !== 0) {
+                    throw new Error("Could not extract LLVM and Clang binaries.");
+                }
+                else {
+                    core.info("Succesfully extracted LLVM release")
+                    break;
+                }
             }
 
-            core.info("Succesfully extracted LLVM release")
             core.addPath(`${llvmPath}/bin`)
             core.exportVariable('LIBCLANG_PATH', `${llvmPath}/bin`)
         } else {

diff --git a/.github/actions/install-llvm/index.js b/.github/actions/install-llvm/index.js
@@ -43,18 +43,28 @@ export async function execute(cmd) {
             core.info("Succesfully downloaded LLVM release, extracting...")
             const llvmPath = path.resolve("llvm");
             const _7zPath = path.join(__dirname, '..', 'externals', '7zr.exe');
-            const args = [
-                "-bsp1", // output log info
-                "x", // extract
-                downloadLocation,
-                `-o${llvmPath}`
-            ]
-            const exit = await exec.exec(_7zPath, args);
-            if(exit !== 0) {
-                throw new Error("Could not extract LLVM and Clang binaries.");
+            let attempt = 1;
+            while(true) {
+                const args = [
+                    "x", // extract
+                    downloadLocation,
+                    `-o${llvmPath}`
+                ]
+                const exit = await exec.exec(_7zPath, args);
+                if(exit === 2 && attempt <= 4) {
+                    attempt += 1;
+                    console.error(`Error extracting LLVM release, retrying attempt #${attempt} after 1s..`)
+                    await new Promise(resolve => setTimeout(resolve, 1000));
+                }
+                else if (exit !== 0) {
+                    throw new Error("Could not extract LLVM and Clang binaries.");
+                }
+                else {
+                    core.info("Succesfully extracted LLVM release")
+                    break;
+                }
             }
 
-            core.info("Succesfully extracted LLVM release")
             core.addPath(`${llvmPath}/bin`)
             core.exportVariable('LIBCLANG_PATH', `${llvmPath}/bin`)
         } else {