From 8f790f74aa3eec2c257d79c11a818aad63bf0e55 Mon Sep 17 00:00:00 2001
From: Sander Declerck <sander.declerck@aikido.dev>
Date: Wed, 25 Mar 2026 14:47:06 +0100
Subject: [PATCH 1/2] Restore back to ubuntu runners

---
 .github/workflows/build-and-release.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index d6c810a..d9819ea 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   set-version:
     name: Set version number
-    runs-on: standard-runner-no-rights-public-ip
+    runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.get_version.outputs.tag }}
       is_prerelease: ${{ steps.check_prerelease.outputs.is_prerelease }}
@@ -28,12 +28,15 @@ jobs:
 
       - name: Check if pre-release
         id: check_prerelease
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          IS_PRERELEASE=$(gh release view ${{ steps.get_version.outputs.tag }} --json isPrerelease --jq '.isPrerelease')
+          TAG="${{ steps.get_version.outputs.tag }}"
+          if [[ "$TAG" == *-* ]]; then
+            IS_PRERELEASE=true
+          else
+            IS_PRERELEASE=false
+          fi
           echo "is_prerelease=$IS_PRERELEASE" >> $GITHUB_OUTPUT
-          echo "Release ${{ steps.get_version.outputs.tag }} is pre-release: $IS_PRERELEASE"
+          echo "Release $TAG is pre-release: $IS_PRERELEASE"
 
   create-binaries:
     needs: set-version
@@ -44,7 +47,7 @@ jobs:
   publish-binaries:
     name: Publish to GitHub release
     needs: [set-version, create-binaries]
-    runs-on: standard-runner-no-rights-public-ip
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code

From bf8ee5104598d9ae2a6167e0a23e99ab62a4ff9b Mon Sep 17 00:00:00 2001
From: Sander Declerck <sander.declerck@aikido.dev>
Date: Wed, 25 Mar 2026 14:53:34 +0100
Subject: [PATCH 2/2] Use softprops/action-gh-release to upload releases

---
 .github/workflows/build-and-release.yml | 48 +++++++++++++++----------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index d9819ea..f44b3ce 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -85,27 +85,37 @@ jobs:
           cp install-scripts/uninstall-endpoint-mac.sh release-artifacts/uninstall-endpoint-mac.sh
           cp install-scripts/uninstall-endpoint-windows.ps1 release-artifacts/uninstall-endpoint-windows.ps1
 
-      - name: Upload binaries to existing GitHub Release
+
+      - name: Upload all assets to release
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
+        with:
+          files: |
+            release-artifacts/safe-chain-macos-x64
+            release-artifacts/safe-chain-macos-arm64
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          gh release upload ${{ needs.set-version.outputs.version }} \
-            release-artifacts/safe-chain-macos-x64 \
-            release-artifacts/safe-chain-macos-arm64 \
-            release-artifacts/safe-chain-linux-x64 \
-            release-artifacts/safe-chain-linux-arm64 \
-            release-artifacts/safe-chain-linuxstatic-x64 \
-            release-artifacts/safe-chain-linuxstatic-arm64 \
-            release-artifacts/safe-chain-win-x64.exe \
-            release-artifacts/safe-chain-win-arm64.exe \
-            release-artifacts/install-safe-chain.sh \
-            release-artifacts/install-safe-chain.ps1 \
-            release-artifacts/uninstall-safe-chain.sh \
-            release-artifacts/uninstall-safe-chain.ps1 \
-            release-artifacts/install-endpoint-mac.sh \
-            release-artifacts/install-endpoint-windows.ps1 \
-            release-artifacts/uninstall-endpoint-mac.sh \
-            release-artifacts/uninstall-endpoint-windows.ps1
+
+      # - name: Upload binaries to existing GitHub Release
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   run: |
+      #     gh release upload ${{ needs.set-version.outputs.version }} \
+      #       release-artifacts/safe-chain-macos-x64 \
+      #       release-artifacts/safe-chain-macos-arm64 \
+      #       release-artifacts/safe-chain-linux-x64 \
+      #       release-artifacts/safe-chain-linux-arm64 \
+      #       release-artifacts/safe-chain-linuxstatic-x64 \
+      #       release-artifacts/safe-chain-linuxstatic-arm64 \
+      #       release-artifacts/safe-chain-win-x64.exe \
+      #       release-artifacts/safe-chain-win-arm64.exe \
+      #       release-artifacts/install-safe-chain.sh \
+      #       release-artifacts/install-safe-chain.ps1 \
+      #       release-artifacts/uninstall-safe-chain.sh \
+      #       release-artifacts/uninstall-safe-chain.ps1 \
+      #       release-artifacts/install-endpoint-mac.sh \
+      #       release-artifacts/install-endpoint-windows.ps1 \
+      #       release-artifacts/uninstall-endpoint-mac.sh \
+      #       release-artifacts/uninstall-endpoint-windows.ps1
 
   publish-npm:
     name: Publish to npm