From 5144d9f5f7864711112311552d06c697d4cdf1ba Mon Sep 17 00:00:00 2001
From: Gareth Sylvester-Bradley <31761158+garethsb@users.noreply.github.com>
Date: Tue, 7 Dec 2021 18:03:28 +0000
Subject: [PATCH] Fix Ubuntu 20.04 test runner installation of SDPoker (#218)

Explicitly pecify git+https://git@github.com/{user}/{repo}.git to workaround npm "feature" of rewriting GitHub package specs (https://github.com/npm/cli/issues/2610), which applies on GitHub Actions after the Ubuntu 20.04 image 20211129.1 update (https://github.com/actions/virtual-environments/pull/4625) upgraded to Node v16.13.0 (npm v8.1.0)

Finally, stop using sudo in order to avoid permissions issue on the npm cache (https://github.com/npm/cli/issues/624)
---
 .github/workflows/build-test.yml    | 12 ++----------
 .github/workflows/src/amwa-test.yml |  6 +-----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 5ec45dcce..348f8443b 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -358,11 +358,7 @@ jobs:
           pip install -r requirements.txt
     
           # Install SDPoker
-          if [[ "${{ matrix.os }}" == "windows-latest" || "$EUID" == "0" ]]; then
-            npm install -g AMWA-TV/sdpoker
-          else
-            sudo npm install -g AMWA-TV/sdpoker
-          fi
+          npm install -g git+https://git@github.com/AMWA-TV/sdpoker.git
           run_python="python"
         fi
         pip install -r utilities/run-test-suites/gsheetsImport/requirements.txt
@@ -763,11 +759,7 @@ jobs:
           pip install -r requirements.txt
     
           # Install SDPoker
-          if [[ "${{ matrix.os }}" == "windows-latest" || "$EUID" == "0" ]]; then
-            npm install -g AMWA-TV/sdpoker
-          else
-            sudo npm install -g AMWA-TV/sdpoker
-          fi
+          npm install -g git+https://git@github.com/AMWA-TV/sdpoker.git
           run_python="python"
         fi
         pip install -r utilities/run-test-suites/gsheetsImport/requirements.txt
diff --git a/.github/workflows/src/amwa-test.yml b/.github/workflows/src/amwa-test.yml
index aa2202570..2653cc183 100644
--- a/.github/workflows/src/amwa-test.yml
+++ b/.github/workflows/src/amwa-test.yml
@@ -48,11 +48,7 @@
       pip install -r requirements.txt
 
       # Install SDPoker
-      if [[ "${{ matrix.os }}" == "windows-latest" || "$EUID" == "0" ]]; then
-        npm install -g AMWA-TV/sdpoker
-      else
-        sudo npm install -g AMWA-TV/sdpoker
-      fi
+      npm install -g git+https://git@github.com/AMWA-TV/sdpoker.git
       run_python="python"
     fi
     pip install -r utilities/run-test-suites/gsheetsImport/requirements.txt