From 3130405ec5390dd9fd9af9f19d5fd73e5e7e4de4 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 12:42:26 -0500 Subject: [PATCH 01/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4e4edc3..1fa5b12 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -4,7 +4,7 @@ summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. base: core20 -grade: devel +grade: stable confinement: strict architectures: From 4b1f709773aa4c0756f65bd8e29714e2cbf9c01b Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 12:48:38 -0500 Subject: [PATCH 02/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 1fa5b12..773b75e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core20 +base: core22 grade: stable confinement: strict From c152dc92191b3bed1420b764cf6772d550c80ce8 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 12:52:58 -0500 Subject: [PATCH 03/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 773b75e..988278d 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,7 +13,7 @@ architectures: - build-on: armhf - build-on: arm64 - build-on: s390x - - build-on: ppc64le + - build-on: ppc64el parts: ngrok: From 98b79e6faf8db1f4dd986e8e376cc4c8aba2bb2c Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 12:55:24 -0500 Subject: [PATCH 04/74] Update snapcraft.yaml --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 988278d..68185ce 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,7 +13,7 @@ architectures: - build-on: armhf - build-on: arm64 - build-on: s390x - - build-on: ppc64el + #- build-on: ppc64le parts: ngrok: @@ -24,7 +24,7 @@ parts: - on armhf: https://bin.equinox.io/a/fB2XkincXBG/ngrok-v3-3.19.1-linux-arm.zip - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip - - on ppc64le: https://bin.equinox.io/a/5U2LkSwxSBr/ngrok-v3-3.19.1-linux-ppc64le.zip + #- on ppc64le: https://bin.equinox.io/a/5U2LkSwxSBr/ngrok-v3-3.19.1-linux-ppc64le.zip override-pull: | snapcraftctl pull snapcraftctl set-version $(./ngrok --version | cut -d " " -f 3) From 4d02af826b0fc365378e3c4f4ea3e875aeec570f Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 13:10:45 -0500 Subject: [PATCH 05/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 68185ce..2104649 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core22 +base: core20 grade: stable confinement: strict From fd3c3e36afdc0c8609f1e1a3a3e633e9d4be82ce Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 13:15:07 -0500 Subject: [PATCH 06/74] set back to recommended stable snap base --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 2104649..68185ce 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core20 +base: core22 grade: stable confinement: strict From 10c4fdb746d16fdba90f322843bffe01785f7a64 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 13:29:42 -0500 Subject: [PATCH 07/74] removes deprecated snapcraftctl command in core22 https://snapcraft.io/docs/overrides --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 68185ce..180fc8a 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -26,8 +26,8 @@ parts: - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip #- on ppc64le: https://bin.equinox.io/a/5U2LkSwxSBr/ngrok-v3-3.19.1-linux-ppc64le.zip override-pull: | - snapcraftctl pull - snapcraftctl set-version $(./ngrok --version | cut -d " " -f 3) + craftctl pull + craftctl set-version $(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From 0e140e0d9cec9a6def070f054f99e6e4036173c6 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 13:32:57 -0500 Subject: [PATCH 08/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 180fc8a..028c351 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -26,7 +26,7 @@ parts: - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip #- on ppc64le: https://bin.equinox.io/a/5U2LkSwxSBr/ngrok-v3-3.19.1-linux-ppc64le.zip override-pull: | - craftctl pull + craftctl default craftctl set-version $(./ngrok --version | cut -d " " -f 3) plugs: From 73e59fc344951165102f20fc4930e06dab952df1 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 13:35:16 -0500 Subject: [PATCH 09/74] fixes set command --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 028c351..cd22035 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -27,7 +27,7 @@ parts: #- on ppc64le: https://bin.equinox.io/a/5U2LkSwxSBr/ngrok-v3-3.19.1-linux-ppc64le.zip override-pull: | craftctl default - craftctl set-version $(./ngrok --version | cut -d " " -f 3) + craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From b868df5ba3600d77e94ce6a7daaf9177f8684335 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 14:08:35 -0500 Subject: [PATCH 10/74] Update snapcraft.yaml --- snapcraft.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index cd22035..a95bb56 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -8,12 +8,11 @@ grade: stable confinement: strict architectures: - - build-on: amd64 - - build-on: i386 - - build-on: armhf - - build-on: arm64 - - build-on: s390x - #- build-on: ppc64le + - build-on: [amd64] + - build-on: [i386] + - build-on: [armhf] + - build-on: [arm64] + - build-on: [s390x] parts: ngrok: @@ -24,7 +23,6 @@ parts: - on armhf: https://bin.equinox.io/a/fB2XkincXBG/ngrok-v3-3.19.1-linux-arm.zip - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip - #- on ppc64le: https://bin.equinox.io/a/5U2LkSwxSBr/ngrok-v3-3.19.1-linux-ppc64le.zip override-pull: | craftctl default craftctl set version=$(./ngrok --version | cut -d " " -f 3) From d1778b9bba267ae16372f864573225eb7265ae0f Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 14:22:33 -0500 Subject: [PATCH 11/74] Update snap.yaml --- .github/workflows/snap.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 8a26324..5773e00 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -55,8 +55,7 @@ jobs: path: ngrok pattern: ngrok-* merge-multiple: true - - - run: ls -l ngrok + - run: ls -R ngrok - name: Publish to Snap Store env: From b11b229aaff315d959e20f19d043fa12259fd92d Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 14:30:31 -0500 Subject: [PATCH 12/74] Update snap.yaml --- .github/workflows/snap.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 5773e00..56270a0 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -54,7 +54,6 @@ jobs: with: path: ngrok pattern: ngrok-* - merge-multiple: true - run: ls -R ngrok - name: Publish to Snap Store From f32c034e44c2d1ea1d05ec038ac636305e30e684 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 18:30:46 -0500 Subject: [PATCH 13/74] Update snap.yaml --- .github/workflows/snap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 56270a0..5773e00 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -54,6 +54,7 @@ jobs: with: path: ngrok pattern: ngrok-* + merge-multiple: true - run: ls -R ngrok - name: Publish to Snap Store From 9ee044bf4b2adc2a3203f6738689d3310725cb11 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 18:41:33 -0500 Subject: [PATCH 14/74] Update snapcraft.yaml --- snapcraft.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index a95bb56..41f451c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -8,11 +8,11 @@ grade: stable confinement: strict architectures: - - build-on: [amd64] - - build-on: [i386] - - build-on: [armhf] - - build-on: [arm64] - - build-on: [s390x] + - build-on: amd64 + - build-on: i386 + - build-on: armhf + - build-on: arm64 + - build-on: s390x parts: ngrok: From bf624ff79ec31216efd5682e041875e829b2f65e Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 18:57:59 -0500 Subject: [PATCH 15/74] testing --- .github/workflows/snap.yaml | 5 +++++ snapcraft.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 5773e00..885cc93 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -43,6 +43,11 @@ jobs: name: ngrok-${{ matrix.architecture }} path: ${{ env.snap }} + - name: Cleanup + run: | + snapcraft clean --destructive-mode + rm -rf prime parts stage + publish: # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' diff --git a/snapcraft.yaml b/snapcraft.yaml index 41f451c..8dbde69 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,10 +9,15 @@ confinement: strict architectures: - build-on: amd64 + build-for: amd64 - build-on: i386 + build-for: i386 - build-on: armhf + build-for: armhf - build-on: arm64 + build-for: arm64 - build-on: s390x + build-for: s390x parts: ngrok: From d6106404513cae6648a236248de7534a10e8fb24 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:00:48 -0500 Subject: [PATCH 16/74] Update snap.yaml --- .github/workflows/snap.yaml | 44 ++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 885cc93..a49e73c 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -48,26 +48,26 @@ jobs: snapcraft clean --destructive-mode rm -rf prime parts stage - publish: - # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered - if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' - runs-on: ubuntu-latest - needs: build # Wait for the build job to complete - steps: - - name: Download All Artifacts - uses: actions/download-artifact@v4 - with: - path: ngrok - pattern: ngrok-* - merge-multiple: true - - run: ls -R ngrok + # publish: + # # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered + # if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' + # runs-on: ubuntu-latest + # needs: build # Wait for the build job to complete + # steps: + # - name: Download All Artifacts + # uses: actions/download-artifact@v4 + # with: + # path: ngrok + # pattern: ngrok-* + # merge-multiple: true + # - run: ls -R ngrok - - name: Publish to Snap Store - env: - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} - run: | - sudo snap install snapcraft --classic - for snap in ngrok/*.snap; do - echo "Publishing $snap" - snapcraft push "$snap" --release=stable - done + # - name: Publish to Snap Store + # env: + # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} + # run: | + # sudo snap install snapcraft --classic + # for snap in ngrok/*.snap; do + # echo "Publishing $snap" + # snapcraft push "$snap" --release=stable + # done From 03f6f91a1164acde821a5f662f7bcf0123dc77b8 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:15:32 -0500 Subject: [PATCH 17/74] Update snapcraft.yaml --- snapcraft.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 8dbde69..41f451c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,15 +9,10 @@ confinement: strict architectures: - build-on: amd64 - build-for: amd64 - build-on: i386 - build-for: i386 - build-on: armhf - build-for: armhf - build-on: arm64 - build-for: arm64 - build-on: s390x - build-for: s390x parts: ngrok: From 347bdf3264efa5966f03981018238e200e7e7995 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:22:52 -0500 Subject: [PATCH 18/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 41f451c..4e01560 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,7 +24,7 @@ parts: - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | - craftctl default + craftctl default --shell craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: From 7f9883ae2be491f67d7ac05168dbaa4134abca49 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:25:19 -0500 Subject: [PATCH 19/74] Update snapcraft.yaml --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4e01560..1d6d9b8 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,8 +24,8 @@ parts: - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | - craftctl default --shell - craftctl set version=$(./ngrok --version | cut -d " " -f 3) + snapcraftctl pull + snapcraftctl set-version $(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From 7ec2e59d8096d2318f911273bdf026768d71369d Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:33:06 -0500 Subject: [PATCH 20/74] testing more --- .github/workflows/snap.yaml | 7 +------ snapcraft.yaml | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index a49e73c..7bf19f7 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -31,7 +31,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} + snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} --shell SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT @@ -43,11 +43,6 @@ jobs: name: ngrok-${{ matrix.architecture }} path: ${{ env.snap }} - - name: Cleanup - run: | - snapcraft clean --destructive-mode - rm -rf prime parts stage - # publish: # # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered # if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' diff --git a/snapcraft.yaml b/snapcraft.yaml index 1d6d9b8..41f451c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,8 +24,8 @@ parts: - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | - snapcraftctl pull - snapcraftctl set-version $(./ngrok --version | cut -d " " -f 3) + craftctl default + craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From 59cb20cbf969829cab958a3c6b342dd03794ba2a Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:37:34 -0500 Subject: [PATCH 21/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 41f451c..db0f827 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core22 +base: core20 grade: stable confinement: strict From 05b952bd69981653201a21d8c48e85f34f565b07 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:37:47 -0500 Subject: [PATCH 22/74] Update snap.yaml --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 7bf19f7..f87d648 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -31,7 +31,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} --shell + snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From fe19262f1931844a13ac048fc57de3cef40075bb Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:41:17 -0500 Subject: [PATCH 23/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index db0f827..a755e1f 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,7 +24,7 @@ parts: - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | - craftctl default + snapcraftctl default craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: From 903793e45be59a855300db9ef9ebb843d119cd1f Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:43:22 -0500 Subject: [PATCH 24/74] typo --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index a755e1f..0e9b5ca 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,7 +24,7 @@ parts: - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | - snapcraftctl default + snapcraftctl pull craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: From 2fde3b9eae7f6386a9ca36b0fe0813ec5c79f6c9 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:47:47 -0500 Subject: [PATCH 25/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 0e9b5ca..ca6e999 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -25,7 +25,7 @@ parts: - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | snapcraftctl pull - craftctl set version=$(./ngrok --version | cut -d " " -f 3) + snapcraftctl set-version $(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From 9b7b0f526bb25ccfa402bbee4c31c9afda8fd794 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 19:55:11 -0500 Subject: [PATCH 26/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index ca6e999..1d6d9b8 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core20 +base: core22 grade: stable confinement: strict From 010ab5aafc2aa6354d0f212bcd96aba85dce9de9 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:00:22 -0500 Subject: [PATCH 27/74] culprit is core22, nothing else --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 1d6d9b8..41f451c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,8 +24,8 @@ parts: - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | - snapcraftctl pull - snapcraftctl set-version $(./ngrok --version | cut -d " " -f 3) + craftctl default + craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From 2848c76db3ab224d6554bb14da61ca6d0df33d03 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:07:34 -0500 Subject: [PATCH 28/74] tries core24 --- snapcraft.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 41f451c..4eaac1b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,16 +3,16 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core22 +base: core24 grade: stable confinement: strict -architectures: - - build-on: amd64 - - build-on: i386 - - build-on: armhf - - build-on: arm64 - - build-on: s390x +platforms: + amd64: + i386: + armhf: + arm64: + s390x: parts: ngrok: From dc40db0b3e088fd391667f8b7188c9e371aeb7b9 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:17:09 -0500 Subject: [PATCH 29/74] removes multipass to use lxd default again --- .github/workflows/snap.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index f87d648..bdf491e 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -25,9 +25,6 @@ jobs: - name: Set up Snapcraft run: sudo snap install snapcraft --classic - - name: Install Multipass - run: sudo snap install multipass --classic - - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | From f98c5a415bff841b92696d40cd6a2f8357342baa Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:25:41 -0500 Subject: [PATCH 30/74] Update snapcraft.yaml --- snapcraft.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 4eaac1b..db0f827 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,16 +3,16 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core24 +base: core20 grade: stable confinement: strict -platforms: - amd64: - i386: - armhf: - arm64: - s390x: +architectures: + - build-on: amd64 + - build-on: i386 + - build-on: armhf + - build-on: arm64 + - build-on: s390x parts: ngrok: From 4d0dd0e7f70eeb314e2e972c18f1599961abba03 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:27:38 -0500 Subject: [PATCH 31/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index db0f827..41f451c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core20 +base: core22 grade: stable confinement: strict From 90aedf8e10cc12b3608e273eeb66a28bde7e9d89 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:44:12 -0500 Subject: [PATCH 32/74] Update snap.yaml --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index bdf491e..660755a 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -28,7 +28,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} + snapcraft build --destructive-mode --build-for=${{ matrix.architecture }} --use-lxd SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From 6187710951df65409db68e7bd3babfc0db037591 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:48:29 -0500 Subject: [PATCH 33/74] Update snap.yaml --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 660755a..388e214 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -28,7 +28,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft build --destructive-mode --build-for=${{ matrix.architecture }} --use-lxd + snapcraft build --destructive-mode --build-for=${{ matrix.architecture }} SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From 6e267edcbec1895aabf6599a5b526ea95cf5cd6e Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:55:04 -0500 Subject: [PATCH 34/74] trying to fix host arch issue --- snapcraft.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 41f451c..45e8327 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,10 +9,7 @@ confinement: strict architectures: - build-on: amd64 - - build-on: i386 - - build-on: armhf - - build-on: arm64 - - build-on: s390x + build-for: [amd64, i386, armhf, arm64, s390x] parts: ngrok: From cc6ba91a1966691b3b4dfc710e95586911934f79 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 20:58:28 -0500 Subject: [PATCH 35/74] Update snapcraft.yaml --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 45e8327..18a8c68 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -8,8 +8,8 @@ grade: stable confinement: strict architectures: - - build-on: amd64 - build-for: [amd64, i386, armhf, arm64, s390x] + - build-on: [amd64, i386, armhf, arm64, s390x] + build-for: all parts: ngrok: From 6f47698ef8f58dce085489f612a808bfb26bf262 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 21:02:28 -0500 Subject: [PATCH 36/74] Update snapcraft.yaml --- snapcraft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 18a8c68..b7074da 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,7 +9,6 @@ confinement: strict architectures: - build-on: [amd64, i386, armhf, arm64, s390x] - build-for: all parts: ngrok: From c6f1db7fe1d2f42d1577a827c04ec807c942becc Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 21:22:14 -0500 Subject: [PATCH 37/74] testing --- .github/workflows/snap.yaml | 2 +- snapcraft.yaml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 388e214..dc0d774 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -28,7 +28,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft build --destructive-mode --build-for=${{ matrix.architecture }} + snapcraft --destructive-mode --target-arch=${{ matrix.architecture }} SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT diff --git a/snapcraft.yaml b/snapcraft.yaml index b7074da..41f451c 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -8,7 +8,11 @@ grade: stable confinement: strict architectures: - - build-on: [amd64, i386, armhf, arm64, s390x] + - build-on: amd64 + - build-on: i386 + - build-on: armhf + - build-on: arm64 + - build-on: s390x parts: ngrok: From 49f94e61e5dd8b2e92eb5a43993f0a4f70fd47c6 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 21:26:06 -0500 Subject: [PATCH 38/74] Update snapcraft.yaml --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 41f451c..db0f827 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,7 +3,7 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core22 +base: core20 grade: stable confinement: strict From 6dd5b3575b8fe46e6836317669334e83bdd65d20 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 21:26:57 -0500 Subject: [PATCH 39/74] Update snap.yaml --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index dc0d774..79f8392 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -28,7 +28,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode --target-arch=${{ matrix.architecture }} + snapcraft --destructive-mode -enable-experimental-target-arch --target-arch=${{ matrix.architecture }} SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From 489ebcb6ac86a033d2ab43526acf428d00f98300 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 21:28:32 -0500 Subject: [PATCH 40/74] adds missing hyphen --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 79f8392..bdf491e 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -28,7 +28,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode -enable-experimental-target-arch --target-arch=${{ matrix.architecture }} + snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From 798539d22bbbb65b20afc0be1db80efbf66505e1 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sat, 25 Jan 2025 21:32:21 -0500 Subject: [PATCH 41/74] Update snapcraft.yaml --- snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index db0f827..1f60235 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -23,6 +23,8 @@ parts: - on armhf: https://bin.equinox.io/a/fB2XkincXBG/ngrok-v3-3.19.1-linux-arm.zip - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip + override-prime: | + snapcraftctl prime override-pull: | craftctl default craftctl set version=$(./ngrok --version | cut -d " " -f 3) From 7637b9ac3f6e259489b4220a565349909a3456b3 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 09:35:24 -0500 Subject: [PATCH 42/74] use core22 + removes --target-arch flag because core22 uses architectures defined in snapcraft.yaml --- .github/workflows/snap.yaml | 9 ++++++--- snapcraft.yaml | 29 ++++++++++++++++------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index bdf491e..634a675 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -22,13 +22,16 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up Snapcraft - run: sudo snap install snapcraft --classic + - name: Install build dependencies + run: | + sudo apt-get update + sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-s390x-linux-gnu gcc-i686-linux-gnu + sudo snap install snapcraft --classic - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode --enable-experimental-target-arch --target-arch=${{ matrix.architecture }} + snapcraft --destructive-mode SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT diff --git a/snapcraft.yaml b/snapcraft.yaml index 1f60235..39c5e23 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -3,28 +3,31 @@ adopt-info: ngrok summary: ngrok secure introspectable tunnels to localhost. description: ngrok is a secure ingress platform that enables developers to add global server load balancing, reverse proxy, firewall, API gateway and Kubernetes Ingress to applications and APIs. -base: core20 +base: core22 grade: stable confinement: strict -architectures: +architectures: # github actions uses amd64 as host architecture - build-on: amd64 - - build-on: i386 - - build-on: armhf - - build-on: arm64 - - build-on: s390x + run-on: [amd64] + - build-on: amd64 + run-on: [i386] + - build-on: amd64 + run-on: [armhf] + - build-on: amd64 + run-on: [arm64] + - build-on: amd64 + run-on: [s390x] parts: ngrok: plugin: dump source: - - on amd64: https://bin.equinox.io/a/cp4zbqoWWC1/ngrok-v3-3.19.1-linux-amd64.zip - - on i386: https://bin.equinox.io/a/7RDEFXtBbAj/ngrok-v3-3.19.1-linux-386.zip - - on armhf: https://bin.equinox.io/a/fB2XkincXBG/ngrok-v3-3.19.1-linux-arm.zip - - on arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - - on s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip - override-prime: | - snapcraftctl prime + - on amd64 to amd64: https://bin.equinox.io/a/cp4zbqoWWC1/ngrok-v3-3.19.1-linux-amd64.zip + - on amd64 to i386: https://bin.equinox.io/a/7RDEFXtBbAj/ngrok-v3-3.19.1-linux-386.zip + - on amd64 to armhf: https://bin.equinox.io/a/fB2XkincXBG/ngrok-v3-3.19.1-linux-arm.zip + - on amd64 to arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip + - on amd64 to s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | craftctl default craftctl set version=$(./ngrok --version | cut -d " " -f 3) From 51313077539f744b79d736257255c66a87dc8ddd Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 09:40:48 -0500 Subject: [PATCH 43/74] figuring out core22 syntax --- snapcraft.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 39c5e23..ba763a9 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -8,16 +8,12 @@ grade: stable confinement: strict architectures: # github actions uses amd64 as host architecture - - build-on: amd64 - run-on: [amd64] - - build-on: amd64 - run-on: [i386] - - build-on: amd64 - run-on: [armhf] - - build-on: amd64 - run-on: [arm64] - - build-on: amd64 - run-on: [s390x] + - build-on: [amd64] + - build-for: [amd64] + - build-for: [i386] + - build-for: [armhf] + - build-for: [arm64] + - build-for: [s390x] parts: ngrok: From e8dfb6d852751bcae823ac1487910da1308b75c8 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 09:44:03 -0500 Subject: [PATCH 44/74] build-for has to be a string, not a dict --- snapcraft.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index ba763a9..5f2e49a 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,11 +9,11 @@ confinement: strict architectures: # github actions uses amd64 as host architecture - build-on: [amd64] - - build-for: [amd64] - - build-for: [i386] - - build-for: [armhf] - - build-for: [arm64] - - build-for: [s390x] + - build-for: amd64 + - build-for: i386 + - build-for: armhf + - build-for: arm64 + - build-for: s390x parts: ngrok: From e262906b7a6e47eb0678ba63824b8e577a873305 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 09:46:53 -0500 Subject: [PATCH 45/74] Update snapcraft.yaml --- snapcraft.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 5f2e49a..74e46e8 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -9,11 +9,15 @@ confinement: strict architectures: # github actions uses amd64 as host architecture - build-on: [amd64] - - build-for: amd64 - - build-for: i386 - - build-for: armhf - - build-for: arm64 - - build-for: s390x + build-for: amd64 + - build-on: [amd64, i386] + build-for: i386 + - build-on: [amd64, armhf] + build-for: armhf + - build-on: [amd64, arm64] + build-for: arm64 + - build-on: [amd64, s390x] + build-for: s390x parts: ngrok: From 873b3b599784e7a239181d955817f8fbb5aef73d Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 09:52:26 -0500 Subject: [PATCH 46/74] Update snap.yaml --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 634a675..180de75 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -31,7 +31,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode + snapcraft --destructive-mode --build-for=${{matrix.architecture}} SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From 00265d1774f75364f558bc7189a0918e0a4a9e24 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 10:00:07 -0500 Subject: [PATCH 47/74] fix version being undefined sometimes modifies the version extraction to not depend on executing the binary. --- snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 74e46e8..f916626 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -30,7 +30,8 @@ parts: - on amd64 to s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | craftctl default - craftctl set version=$(./ngrok --version | cut -d " " -f 3) + VERSION=$(echo $CRAFT_SOURCE | grep -o 'ngrok-v3-[0-9.]*' | cut -d'-' -f3) + craftctl set version=$VERSION plugs: ngrok-config: From 6223d1a2d73290d117bdb4c6654d91ee2e9aedfd Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 10:02:16 -0500 Subject: [PATCH 48/74] get the version from the url --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index f916626..bddd8dc 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -30,7 +30,7 @@ parts: - on amd64 to s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip override-pull: | craftctl default - VERSION=$(echo $CRAFT_SOURCE | grep -o 'ngrok-v3-[0-9.]*' | cut -d'-' -f3) + VERSION=$(find . -name "ngrok-v3-*.zip" | head -n1 | grep -o 'ngrok-v3-[0-9.]*' | cut -d'-' -f3) craftctl set version=$VERSION plugs: From 7674240185a3be91fd8103270f1b5d7d6aeeaf5e Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 12:50:56 -0500 Subject: [PATCH 49/74] hardcode the version --- .github/workflows/snap.yaml | 2 +- snapcraft.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 180de75..e799674 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -26,7 +26,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-s390x-linux-gnu gcc-i686-linux-gnu - sudo snap install snapcraft --classic + sudo apt install snapcraft - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap diff --git a/snapcraft.yaml b/snapcraft.yaml index bddd8dc..a1e1bad 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -21,17 +21,17 @@ architectures: # github actions uses amd64 as host architecture parts: ngrok: - plugin: dump - source: + plugin: dump # used for unpacking the zip files + source: # location of the source code - on amd64 to amd64: https://bin.equinox.io/a/cp4zbqoWWC1/ngrok-v3-3.19.1-linux-amd64.zip - on amd64 to i386: https://bin.equinox.io/a/7RDEFXtBbAj/ngrok-v3-3.19.1-linux-386.zip - on amd64 to armhf: https://bin.equinox.io/a/fB2XkincXBG/ngrok-v3-3.19.1-linux-arm.zip - on amd64 to arm64: https://bin.equinox.io/a/96AhmnoTXuz/ngrok-v3-3.19.1-linux-arm64.zip - on amd64 to s390x: https://bin.equinox.io/a/kLoGADrsu9d/ngrok-v3-3.19.1-linux-s390x.zip - override-pull: | + override-pull: + | # pwd is the part's source directory in parts//src/ craftctl default - VERSION=$(find . -name "ngrok-v3-*.zip" | head -n1 | grep -o 'ngrok-v3-[0-9.]*' | cut -d'-' -f3) - craftctl set version=$VERSION + craftctl set version=$(./ngrok --version | cut -d " " -f 3) plugs: ngrok-config: From a05ee3d6e1d696c32a68981f0398abd7abe5ac01 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:01:39 -0500 Subject: [PATCH 50/74] snap is more stable --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index e799674..9731e5d 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -26,7 +26,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-s390x-linux-gnu gcc-i686-linux-gnu - sudo apt install snapcraft + sudo snap install snapcraft - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap From e763e7492c9cf613c85ddc33257eb4582a9620c5 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:06:58 -0500 Subject: [PATCH 51/74] Update snap.yaml --- .github/workflows/snap.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 9731e5d..8fc250b 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -9,9 +9,20 @@ on: # The event that triggers the workflow workflow_dispatch: # When the workflow is manually triggered jobs: + install: + # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered + if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install snapcraft + run: sudo snap install snapcraft build: # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' + needs: install # Wait for the install job to complete runs-on: ubuntu-latest strategy: matrix: @@ -22,11 +33,8 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install build dependencies - run: | - sudo apt-get update - sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf gcc-s390x-linux-gnu gcc-i686-linux-gnu - sudo snap install snapcraft + - name: Install snapcraft + run: sudo snap install snapcraft - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap From 8b4a25c3b0204e1122cff3dbd855b6bc1c023ed0 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:09:42 -0500 Subject: [PATCH 52/74] uses ubuntu 22.04 to match snapcraft config --- .github/workflows/snap.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 8fc250b..d4a061d 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -12,7 +12,7 @@ jobs: install: # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -23,7 +23,7 @@ jobs: # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' needs: install # Wait for the install job to complete - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: architecture: [amd64, i386, armhf, arm64, s390x] #ppc64le] @@ -54,7 +54,7 @@ jobs: # publish: # # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered # if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' - # runs-on: ubuntu-latest + # runs-on: ubuntu-22.04 # needs: build # Wait for the build job to complete # steps: # - name: Download All Artifacts From 40d830ecac5cdaa8ce44cb89a4a5449e2873ecba Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:17:03 -0500 Subject: [PATCH 53/74] apt is used for ubuntu version 22.04 --- .github/workflows/snap.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index d4a061d..41739ec 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@v2 - name: Install snapcraft - run: sudo snap install snapcraft + run: sudo apt install snapcraft build: # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' @@ -30,19 +30,14 @@ jobs: outputs: snap-file: ${{ steps.build-snap.outputs.snap }} steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Install snapcraft - run: sudo snap install snapcraft - - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft --destructive-mode --build-for=${{matrix.architecture}} + snapcraft SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT + ls -R # Upload the snap file as an artifact - name: Upload Artifact From e70b7d65257c9db9b6885ef34bb6fe2fa70e90d5 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:20:02 -0500 Subject: [PATCH 54/74] Update snap.yaml --- .github/workflows/snap.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 41739ec..e1fcd50 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -9,27 +9,19 @@ on: # The event that triggers the workflow workflow_dispatch: # When the workflow is manually triggered jobs: - install: + build: # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' runs-on: ubuntu-22.04 + outputs: + snap-file: ${{ steps.build-snap.outputs.snap }} steps: - name: Checkout code uses: actions/checkout@v2 - name: Install snapcraft run: sudo apt install snapcraft - build: - # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered - if: contains(github.ref, 'release') || github.event_name == 'workflow_dispatch' - needs: install # Wait for the install job to complete - runs-on: ubuntu-22.04 - strategy: - matrix: - architecture: [amd64, i386, armhf, arm64, s390x] #ppc64le] - outputs: - snap-file: ${{ steps.build-snap.outputs.snap }} - steps: + - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | From 1e3ca59193d6518df93e4104dcd48963e632b8be Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:23:29 -0500 Subject: [PATCH 55/74] needs lxd --- .github/workflows/snap.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index e1fcd50..c9ce98b 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -19,8 +19,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install snapcraft - run: sudo apt install snapcraft + - name: Install snapcraft and deps + run: | + sudo apt install snapcraft + sudo snap install lxd + lxd init --auto - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap From d543d299026c87ad0e3a7f4c3e7a26589da6ff1f Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:25:46 -0500 Subject: [PATCH 56/74] sets permissions to be able to connect to socket --- .github/workflows/snap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index c9ce98b..e492afc 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -23,6 +23,10 @@ jobs: run: | sudo apt install snapcraft sudo snap install lxd + sudo chown root:lxd /var/snap/lxd/common/lxd/unix.socket + sudo chmod 664 /var/snap/lxd/common/lxd/unix.socket + sudo chmod u+s /var/snap/lxd/common/lxd/unix.socket + lxd init --auto - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output From ffab55823c2b01cc70da12da0048383253798536 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:30:02 -0500 Subject: [PATCH 57/74] tries to manually activate the service --- .github/workflows/snap.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index e492afc..8c3331e 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -23,9 +23,7 @@ jobs: run: | sudo apt install snapcraft sudo snap install lxd - sudo chown root:lxd /var/snap/lxd/common/lxd/unix.socket - sudo chmod 664 /var/snap/lxd/common/lxd/unix.socket - sudo chmod u+s /var/snap/lxd/common/lxd/unix.socket + snap services lxd lxd.activate lxd init --auto From eb04e1e7f3e4bcb12340c7e597b597e828aba249 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:31:57 -0500 Subject: [PATCH 58/74] tries as sudo --- .github/workflows/snap.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 8c3331e..57f7dee 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -23,7 +23,9 @@ jobs: run: | sudo apt install snapcraft sudo snap install lxd - snap services lxd lxd.activate + sudo snap services lxd lxd.activate + sudo snap services lxd lxd.daemon + sudo snap services lxd lxd.user-daemon lxd init --auto From c70005554099d95a9fe73b199ca69e66320438b9 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:33:26 -0500 Subject: [PATCH 59/74] Update snap.yaml --- .github/workflows/snap.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 57f7dee..06dc5ec 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -22,12 +22,8 @@ jobs: - name: Install snapcraft and deps run: | sudo apt install snapcraft - sudo snap install lxd - sudo snap services lxd lxd.activate - sudo snap services lxd lxd.daemon - sudo snap services lxd lxd.user-daemon - lxd init --auto + sudo lxd init --auto - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap From 54c924aae6a512724a1956248e9396ff8d5f41c1 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:38:50 -0500 Subject: [PATCH 60/74] Update snap.yaml --- .github/workflows/snap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 06dc5ec..27193d1 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -22,6 +22,7 @@ jobs: - name: Install snapcraft and deps run: | sudo apt install snapcraft + sudo ufw allow in on lxdbr0 sudo ufw route allow in on lxdbr0 sudo ufw route allow out on lxdbr0 sudo lxd init --auto From f667cbd9c824350c1ecc3f5d965aa2fd3c8d52b2 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:43:06 -0500 Subject: [PATCH 61/74] Update snap.yaml --- .github/workflows/snap.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 27193d1..238876a 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -19,13 +19,6 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install snapcraft and deps - run: | - sudo apt install snapcraft - sudo ufw allow in on lxdbr0 sudo ufw route allow in on lxdbr0 sudo ufw route allow out on lxdbr0 - - sudo lxd init --auto - - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | From c9ebdc72d5fea552a9cfb641e75a2baa5711caf9 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:45:08 -0500 Subject: [PATCH 62/74] Update snap.yaml --- .github/workflows/snap.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 238876a..971827a 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -19,6 +19,10 @@ jobs: - name: Checkout code uses: actions/checkout@v2 + - name: Install snapcraft and deps + run: | + sudo apt install snapcraft + - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | From b80187db5274e6b11f56df8298db8886ae0367cb Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:56:24 -0500 Subject: [PATCH 63/74] Update snap.yaml --- .github/workflows/snap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 971827a..a5457bd 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -21,6 +21,7 @@ jobs: - name: Install snapcraft and deps run: | + which snapcraft sudo apt install snapcraft - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output From acedd5f58dc7d1f47878b80dcc5b358561910831 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 13:57:34 -0500 Subject: [PATCH 64/74] Update snap.yaml --- .github/workflows/snap.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index a5457bd..91140ae 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -21,8 +21,7 @@ jobs: - name: Install snapcraft and deps run: | - which snapcraft - sudo apt install snapcraft + sudo snap install snapcraft - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap From b0b1c0c6c8e55549ad6702ceb8d91cdbbfe1f001 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:01:16 -0500 Subject: [PATCH 65/74] Update snap.yaml --- .github/workflows/snap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 91140ae..bb736fe 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -19,9 +19,9 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Install snapcraft and deps + - name: Install snapcraft run: | - sudo snap install snapcraft + sudo snap install snapcraft --classic - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap From e77075cd8900ef9d2d93d1d14471c54104def3b0 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:02:20 -0500 Subject: [PATCH 66/74] Update snap.yaml --- .github/workflows/snap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index bb736fe..b6f2d80 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -26,7 +26,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | - snapcraft + sudo snapcraft --use-lxd SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT From 804518fed30219019663bb31034ea9d5fa01bac7 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:03:32 -0500 Subject: [PATCH 67/74] Update snap.yaml --- .github/workflows/snap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index b6f2d80..da2bc08 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -26,6 +26,7 @@ jobs: - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output id: build-snap run: | + sudo lxd init --auto sudo snapcraft --use-lxd SNAP_FILE=$(ls *.snap) echo "snap=$SNAP_FILE" >> $GITHUB_ENV From 57fe292361178733ac222c50f80ed20bd1ba8c47 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:09:02 -0500 Subject: [PATCH 68/74] tries snapcore action again --- .github/workflows/snap.yaml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index da2bc08..b7634c7 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -23,15 +23,17 @@ jobs: run: | sudo snap install snapcraft --classic - - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output - id: build-snap - run: | - sudo lxd init --auto - sudo snapcraft --use-lxd - SNAP_FILE=$(ls *.snap) - echo "snap=$SNAP_FILE" >> $GITHUB_ENV - echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT - ls -R + # - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output + # id: build-snap + # run: | + # sudo lxd init --auto + # sudo snapcraft --use-lxd + # SNAP_FILE=$(ls *.snap) + # echo "snap=$SNAP_FILE" >> $GITHUB_ENV + # echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT + # ls -R + + - uses: snapcore/action-build@v1 # Upload the snap file as an artifact - name: Upload Artifact From 00b3a7f743432841e47662c540ac8d38c05f3bc9 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:13:15 -0500 Subject: [PATCH 69/74] manually sets the version --- snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index a1e1bad..b3aeac1 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -31,7 +31,7 @@ parts: override-pull: | # pwd is the part's source directory in parts//src/ craftctl default - craftctl set version=$(./ngrok --version | cut -d " " -f 3) + craftctl set version=3.19.1 plugs: ngrok-config: From 8023d7128b6fd205b7bf314e8b822d30aee6fca5 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:13:33 -0500 Subject: [PATCH 70/74] Update snap.yaml --- .github/workflows/snap.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index b7634c7..53bf6ee 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -23,16 +23,6 @@ jobs: run: | sudo snap install snapcraft --classic - # - name: Build the snap # Build the snap for the specified architecture in the matrix strategy above and save the snap file path to an output - # id: build-snap - # run: | - # sudo lxd init --auto - # sudo snapcraft --use-lxd - # SNAP_FILE=$(ls *.snap) - # echo "snap=$SNAP_FILE" >> $GITHUB_ENV - # echo "snap=$SNAP_FILE" >> $GITHUB_OUTPUT - # ls -R - - uses: snapcore/action-build@v1 # Upload the snap file as an artifact From d968a599bb2ba4560ffbfb92c73111d65c8d9edf Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:27:13 -0500 Subject: [PATCH 71/74] Update snap.yaml --- .github/workflows/snap.yaml | 49 +++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 53bf6ee..8d5138a 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -29,29 +29,30 @@ jobs: - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: ngrok-${{ matrix.architecture }} - path: ${{ env.snap }} + name: ngrok-snaps + path: ./*.snap - # publish: - # # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered - # if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' - # runs-on: ubuntu-22.04 - # needs: build # Wait for the build job to complete - # steps: - # - name: Download All Artifacts - # uses: actions/download-artifact@v4 - # with: - # path: ngrok - # pattern: ngrok-* - # merge-multiple: true - # - run: ls -R ngrok + publish: + # Only run this job if the branch name contains "release" or a commit is created on master branch and the branch name contains "release" or manually triggered + if: (github.event_name == 'push' && github.ref == 'refs/heads/master' && contains(github.ref, 'release')) || github.event_name == 'workflow_dispatch' + runs-on: ubuntu-22.04 + needs: build # Wait for the build job to complete + steps: + - run: ls -R ngrok-snaps + + - name: Download All Snap Artifacts + uses: actions/download-artifact@v4 + with: + path: ngrok-snaps + pattern: "*.snap" + merge-multiple: true - # - name: Publish to Snap Store - # env: - # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} - # run: | - # sudo snap install snapcraft --classic - # for snap in ngrok/*.snap; do - # echo "Publishing $snap" - # snapcraft push "$snap" --release=stable - # done + # - name: Publish to Snap Store + # env: + # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} + # run: | + # sudo snap install snapcraft --classic + # for snap in ngrok/*.snap; do + # echo "Publishing $snap" + # snapcraft push "$snap" --release=stable + # done From 8e8d17d65aeacb8a31d9b19ef5ea5fd8ea7e1168 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:33:27 -0500 Subject: [PATCH 72/74] Update snap.yaml --- .github/workflows/snap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 8d5138a..827425e 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -38,8 +38,6 @@ jobs: runs-on: ubuntu-22.04 needs: build # Wait for the build job to complete steps: - - run: ls -R ngrok-snaps - - name: Download All Snap Artifacts uses: actions/download-artifact@v4 with: @@ -47,6 +45,8 @@ jobs: pattern: "*.snap" merge-multiple: true + - run: ls -R ngrok-snaps + # - name: Publish to Snap Store # env: # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} From cf7762c8f36fbea4ccd22901be60dd67d10796e1 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:39:24 -0500 Subject: [PATCH 73/74] Update snap.yaml --- .github/workflows/snap.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 827425e..50d9389 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -42,10 +42,9 @@ jobs: uses: actions/download-artifact@v4 with: path: ngrok-snaps - pattern: "*.snap" merge-multiple: true - - run: ls -R ngrok-snaps + - run: ls -R # - name: Publish to Snap Store # env: From c5a9717d9d0e083889370dd9d066281fb2e93375 Mon Sep 17 00:00:00 2001 From: dthomasngrokker Date: Sun, 26 Jan 2025 14:45:04 -0500 Subject: [PATCH 74/74] test publishing to snap! --- .github/workflows/snap.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index 50d9389..a1bfd18 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -46,12 +46,12 @@ jobs: - run: ls -R - # - name: Publish to Snap Store - # env: - # SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} - # run: | - # sudo snap install snapcraft --classic - # for snap in ngrok/*.snap; do - # echo "Publishing $snap" - # snapcraft push "$snap" --release=stable - # done + - name: Publish to Snap Store + env: + SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }} + run: | + sudo snap install snapcraft --classic + for snap in ngrok-snaps/*.snap; do + echo "Publishing $snap" + snapcraft push "$snap" --release=stable + done