Small-ish fixes and update-deps.yaml refactoring

Author: alwx

.github/workflows/buildandtest.yml

@@ -68,6 +68,10 @@ jobs:
 
       - name: Install Swiftly and Swift
         run: |
+          # Install Swift dependencies first
+          sudo apt-get update
+          sudo apt-get -y install libcurl4-openssl-dev libz3-dev
+
           SWIFTLY_FILE="swiftly-$(uname -m).tar.gz"
           curl -sL https://download.swift.org/swiftly/linux/swiftly-x86_64.tar.gz -o $SWIFTLY_FILE
           tar zxf $SWIFTLY_FILE
@@ -80,8 +84,6 @@ jobs:
           swiftly install 5.10
           swift --version
 
-          sudo apt-get -y install libcurl4-openssl-dev
-
           # Export Swift toolchain path for SwiftLint's SourceKit
           # Dynamically determine the path from the swift binary location
           SWIFT_BIN=$(which swift)

.github/workflows/testflight.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - alwx/experiment/cirrus-labs-for-everythin
 
   pull_request:
     paths:

.github/workflows/update-deps.yml

@@ -9,100 +9,55 @@ on:
     branches:
       - main
 
-jobs:
-  android:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-android.sh
-          name: Android SDK
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  android-stubs:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-android-stubs.sh
-          name: Android SDK Stubs
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  cocoa:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-cocoa.sh
-          name: Cocoa SDK
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  javascript:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-javascript.sh
-          name: JavaScript SDK
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  wizard:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-wizard.sh
-          name: Wizard
-          changelog-entry: false
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
+env:
+  UBUNTU_RUNNER: '["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]'
 
-  cli:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-cli.sh
-          name: CLI
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  bundler-plugins:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-bundler-plugins.sh
-          name: Bundler Plugins
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  sample-rn:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-rn.sh
-          name: React Native
-          pattern: '^v[0-9.]+$' # only match non-preview versions, also ignores "latest"
-          changelog-entry: false
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  maestro:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-maestro.sh
-          name: Maestro
-          pattern: '^v[0-9.]+$' # only match non-preview versions
-          changelog-entry: false
-          ssh-key: ${{ secrets.CI_DEPLOY_KEY }}
-
-  sentry-android-gradle-plugin:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]
-    steps:
-      - uses: getsentry/github-workflows/updater@v3
-        with:
-          path: scripts/update-sentry-android-gradle-plugin.sh
-          name: Sentry Android Gradle Plugin
-          pattern: '^[0-9.]+$'
-          changelog-entry: false
+jobs:
+  update-deps:
+    runs-on: ${{ fromJson(vars.UBUNTU_RUNNER || '["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:12"]') }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - path: scripts/update-android.sh
+            name: Android SDK
+            changelog-entry: true
+          - path: scripts/update-android-stubs.sh
+            name: Android SDK Stubs
+            changelog-entry: true
+          - path: scripts/update-cocoa.sh
+            name: Cocoa SDK
+            changelog-entry: true
+          - path: scripts/update-javascript.sh
+            name: JavaScript SDK
+            changelog-entry: true
+          - path: scripts/update-wizard.sh
+            name: Wizard
+            changelog-entry: false
+          - path: scripts/update-cli.sh
+            name: CLI
+            changelog-entry: true
+          - path: scripts/update-bundler-plugins.sh
+            name: Bundler Plugins
+            changelog-entry: true
+          - path: scripts/update-rn.sh
+            name: React Native
+            pattern: '^v[0-9.]+$'  # only match non-preview versions, also ignores "latest"
+            changelog-entry: false
+          - path: scripts/update-maestro.sh
+            name: Maestro
+            pattern: '^v[0-9.]+$'  # only match non-preview versions
+            changelog-entry: false
+          - path: scripts/update-sentry-android-gradle-plugin.sh
+            name: Sentry Android Gradle Plugin
+            pattern: '^[0-9.]+$'
+            changelog-entry: false
+    name: ${{ matrix.name }}
+    steps:
+      - uses: getsentry/github-workflows/updater@v3
+        with:
+          path: ${{ matrix.path }}
+          name: ${{ matrix.name }}
+          pattern: ${{ matrix.pattern || '' }}
+          changelog-entry: ${{ matrix.changelog-entry }}
           ssh-key: ${{ secrets.CI_DEPLOY_KEY }}