Merge pull request #2 from philrz/update-agents

Update agents and drop old runners
philrz · Dec 16, 2023 · ecde9f3 · ecde9f3
2 parents 52ad496 + 0dd4e41
commit ecde9f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 48 deletions.
diff --git a/.github/workflows/ngrok-macos-10.yml b/.github/workflows/ngrok-macos-10.yml
diff --git a/.github/workflows/ngrok-ubuntu-18.04.yml b/.github/workflows/ngrok-ubuntu-18.04.yml
diff --git a/start_ngrok_tunnel.sh b/start_ngrok_tunnel.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 USER=$(whoami)
+UNPACK="unzip -o"
 
 if [[ -z "$NGROK_TOKEN" ]]; then
   echo "Please set 'NGROK_TOKEN'"
@@ -11,15 +12,16 @@ echo "### Prep for remote login and install ngrok ###"
 
 case $(uname) in
     Darwin)
-        PKG="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-darwin-amd64.zip"
+        PKG="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-darwin-amd64.zip"
         ;;
     Linux)
         # By default, the Actions runner user lacks a .ssh directory and also
         # has a home directory with permissions 777, and sshd will refuse to
         # allow an incoming connection in that state.
         chmod 755 "$HOME"
         mkdir "$HOME"/.ssh
-        PKG="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip"
+        PKG="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-amd64.tgz"
+        UNPACK="tar xzvf"
         ;;
     *_NT-*)
         # I wasn't able to get remote login working on Windows using the public key
@@ -30,7 +32,7 @@ case $(uname) in
             exit 1
         fi
         net user "$USER" "$USER_PASS"
-        PKG="https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-windows-amd64.zip"
+        PKG="https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-windows-amd64.zip"
         exe=.exe
         ;;
 esac
@@ -48,7 +50,7 @@ if [[ $(uname) = "Darwin" || $(uname) = "Linux" ]]; then
 fi
 
 curl -o ngrok.zip "$PKG"
-unzip -o ngrok.zip
+$UNPACK ngrok.zip
 
 echo "### Start ngrok proxy for 22 port ###"