From b601c0df700ad11e1987504256ca78e1b471e2fa Mon Sep 17 00:00:00 2001
From: Phil Rzewski <phil@brimdata.io>
Date: Sat, 16 Dec 2023 12:02:59 -0800
Subject: [PATCH] Point at latest ngrok agents

---
 .github/workflows/ngrok-macos-10.yml     | 22 ----------------------
 .github/workflows/ngrok-ubuntu-18.04.yml | 22 ----------------------
 start_ngrok_tunnel.sh                    |  6 +++---
 3 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 .github/workflows/ngrok-macos-10.yml
 delete mode 100644 .github/workflows/ngrok-ubuntu-18.04.yml

diff --git a/.github/workflows/ngrok-macos-10.yml b/.github/workflows/ngrok-macos-10.yml
deleted file mode 100644
index d5c13f5..0000000
--- a/.github/workflows/ngrok-macos-10.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "ngrok SSH tunnel (macOS 10.15)"
-
-on:
-  workflow_dispatch:
-
-jobs:
-  ngrok_ssh_tunnel:
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.16'
-      - uses: actions/checkout@v3
-      - name: Start SSH via ngrok
-        run: ./start_ngrok_tunnel.sh
-        env:
-          NGROK_TOKEN: ${{ secrets.NGROK_TOKEN }}
-          SSH_PUBLIC_KEY: ${{ secrets.NGROK_SSH_PUBLIC_KEY }}
-        shell: bash
-      - name: Keep tunnel alive for 24 hours
-        run: sleep 86400
-        shell: bash
diff --git a/.github/workflows/ngrok-ubuntu-18.04.yml b/.github/workflows/ngrok-ubuntu-18.04.yml
deleted file mode 100644
index 4571ee3..0000000
--- a/.github/workflows/ngrok-ubuntu-18.04.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "ngrok SSH tunnel (Ubuntu 18.04)"
-
-on:
-  workflow_dispatch:
-
-jobs:
-  ngrok_ssh_tunnel:
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.16'
-      - uses: actions/checkout@v3
-      - name: Start SSH via ngrok
-        run: ./start_ngrok_tunnel.sh
-        env:
-          NGROK_TOKEN: ${{ secrets.NGROK_TOKEN }}
-          SSH_PUBLIC_KEY: ${{ secrets.NGROK_SSH_PUBLIC_KEY }}
-        shell: bash
-      - name: Keep tunnel alive for 24 hours
-        run: sleep 86400
-        shell: bash
diff --git a/start_ngrok_tunnel.sh b/start_ngrok_tunnel.sh
index e16eefa..3f90d95 100755
--- a/start_ngrok_tunnel.sh
+++ b/start_ngrok_tunnel.sh
@@ -11,7 +11,7 @@ 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
@@ -19,7 +19,7 @@ case $(uname) in
         # 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"
         ;;
     *_NT-*)
         # I wasn't able to get remote login working on Windows using the public key
@@ -30,7 +30,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