From: Alex Lam S.L <alexlamsl@gmail.com>
Date: Tue, 7 Apr 2020 00:40:38 +0000 (+0100)
Subject: workaround intermittent nodejs.org corruptions (#3766)
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=41eb4f172552e8d20831673ae5019f9e54b37c11;p=UglifyJS.git

workaround intermittent nodejs.org corruptions (#3766)
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a84daf30..6b1d796c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         shell: bash
         run: |
           git clone --branch v1.5.4 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
-          while !(. ~/.nvs/nvs.sh add $NODE); do
+          while ! timeout 60 bash -c '. ~/.nvs/nvs.sh add $NODE && nvs use $NODE'; do
             cd ~/.nvs
             git clean -xdf
             cd -
@@ -35,5 +35,5 @@ jobs:
           npm config set save false
           npm config set update-notifier false
           npm --version
-          while !(npm install); do echo "'npm install' failed - retrying..."; done;
+          while !(npm install); do echo "'npm install' failed - retrying..."; done
           node test/$TYPE
diff --git a/.github/workflows/ufuzz.yml b/.github/workflows/ufuzz.yml
index c2d63a4a..7a8c70c0 100644
--- a/.github/workflows/ufuzz.yml
+++ b/.github/workflows/ufuzz.yml
@@ -16,7 +16,7 @@ jobs:
         shell: bash
         run: |
           git clone --branch v1.5.4 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
-          while !(. ~/.nvs/nvs.sh add 10); do
+          while ! timeout 60 bash -c '. ~/.nvs/nvs.sh add 10 && nvs use 10'; do
             cd ~/.nvs
             git clean -xdf
             cd -
@@ -29,5 +29,5 @@ jobs:
           npm config set save false
           npm config set update-notifier false
           npm --version
-          while !(npm install); do echo "'npm install' failed - retrying..."; done;
+          while !(npm install); do echo "'npm install' failed - retrying..."; done
           node test/ufuzz/job 3600000