From 7b6bf0522823a9590233d16f124291ba73c55ec6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 25 Feb 2020 17:19:18 -0800
Subject: [PATCH] Retry the entire release process, not just uploading one
 asset

Another attempt to mitigate #978
---
 .github/actions/github-release/main.js | 44 ++++++++++++++------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/.github/actions/github-release/main.js b/.github/actions/github-release/main.js
index 82efc2f82bb2..cd2f3bd73437 100644
--- a/.github/actions/github-release/main.js
+++ b/.github/actions/github-release/main.js
@@ -8,7 +8,7 @@ function sleep(milliseconds) {
   return new Promise(resolve => setTimeout(resolve, milliseconds))
 }
 
-async function run() {
+async function runOnce() {
   // Load all our inputs and env vars. Note that `getInput` reads from `INPUT_*`
   const files = core.getInput('files');
   const name = core.getInput('name');
@@ -76,28 +76,32 @@ async function run() {
   });
 
   // Upload all the relevant assets for this release as just general blobs.
-  const retries = 10;
   for (const file of glob.sync(files)) {
     const size = fs.statSync(file).size;
     core.info(`upload ${file}`);
-    for (let i = 0; i < retries; i++) {
-      try {
-        await octokit.repos.uploadReleaseAsset({
-          data: fs.createReadStream(file),
-          headers: { 'content-length': size, 'content-type': 'application/octet-stream' },
-          name: path.basename(file),
-          url: release.data.upload_url,
-        });
-        break;
-      } catch (e) {
-        if (i === retries - 1)
-          throw e;
-        console.log("ERROR: ", JSON.stringify(e, null, 2));
-        console.log("ERROR: ", e.message);
-        console.log(e.stack);
-        console.log("RETRYING after 10s");
-        await sleep(10000)
-      }
+    await octokit.repos.uploadReleaseAsset({
+      data: fs.createReadStream(file),
+      headers: { 'content-length': size, 'content-type': 'application/octet-stream' },
+      name: path.basename(file),
+      url: release.data.upload_url,
+    });
+  }
+}
+
+async function run() {
+  const retries = 10;
+  for (let i = 0; i < retries; i++) {
+    try {
+      runOnce();
+      break;
+    } catch (e) {
+      if (i === retries - 1)
+        throw e;
+      console.log("ERROR: ", JSON.stringify(e, null, 2));
+      console.log("ERROR: ", e.message);
+      console.log(e.stack);
+      console.log("RETRYING after 10s");
+      await sleep(10000)
     }
   }
 }