From 80d9c44b22fd8d479d0cf86b1037568ea3f94cd7 Mon Sep 17 00:00:00 2001
From: "Alex Lam S.L" <alexlamsl@gmail.com>
Date: Thu, 2 Apr 2020 19:49:38 +0100
Subject: [PATCH] improve resilience against nodejs.org failures (#3759)

---
 .github/workflows/ci.yml    | 13 ++++++++++---
 .github/workflows/ufuzz.yml | 13 ++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8ee8e97..2c1106fc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,10 +22,17 @@ jobs:
         shell: bash
         run: |
           git clone --branch v1.5.4 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
-          . ~/.nvs/nvs.sh --version || . ~/.nvs/nvs.sh --version || . ~/.nvs/nvs.sh --version
+          cd ~/.nvs
+          . ./nvs.sh || { git clean -xdf && . ./nvs.sh; } || { git clean -xdf && . ./nvs.sh; }
+          cd -
+          nvs --version
           nvs add $NODE || nvs add $NODE || nvs add $NODE
           nvs use $NODE
           node --version
-          npm --version --no-update-notifier
-          npm install --no-audit --no-optional --no-save --no-update-notifier
+          npm config set audit false
+          npm config set optional false
+          npm config set save false
+          npm config set update-notifier false
+          npm --version
+          npm install || npm install || npm install
           node test/$TYPE
diff --git a/.github/workflows/ufuzz.yml b/.github/workflows/ufuzz.yml
index 9d755bbf..4b200b37 100644
--- a/.github/workflows/ufuzz.yml
+++ b/.github/workflows/ufuzz.yml
@@ -16,10 +16,17 @@ jobs:
         shell: bash
         run: |
           git clone --branch v1.5.4 --depth 1 https://github.com/jasongin/nvs.git ~/.nvs
-          . ~/.nvs/nvs.sh --version || . ~/.nvs/nvs.sh --version || . ~/.nvs/nvs.sh --version
+          cd ~/.nvs
+          . ./nvs.sh || { git clean -xdf && . ./nvs.sh; } || { git clean -xdf && . ./nvs.sh; }
+          cd -
+          nvs --version
           nvs add 10 || nvs add 10 || nvs add 10
           nvs use 10
           node --version
-          npm --version --no-update-notifier
-          npm install --no-audit --no-optional --no-save --no-update-notifier
+          npm config set audit false
+          npm config set optional false
+          npm config set save false
+          npm config set update-notifier false
+          npm --version
+          npm install || npm install || npm install
           node test/ufuzz/job 3600000
-- 
2.34.1