From 774fd16037c9b4dac9c03aa19b6e31afb85ce962 Mon Sep 17 00:00:00 2001
From: "sentry-junior[bot]"
 <264270552+sentry-junior[bot]@users.noreply.github.com>
Date: Tue, 20 Oct 2026 11:35:39 +0000
Subject: [PATCH] ci: Move jobs from Bitrise back to GitHub-hosted runners
 Co-Authored-By: Nelson Osacky <nelson.osacky@sentry.io>

---
 .github/actionlint.yaml                                | 4 ----
 .github/workflows/build.yml                            | 4 +---
 .github/workflows/codeql-analysis.yml                  | 2 +-
 .github/workflows/format-code.yml                      | 2 +-
 .github/workflows/generate-javadocs.yml                | 2 +-
 .github/workflows/integration-tests-macrobenchmark.yml | 2 +-
 .github/workflows/integration-tests-size.yml           | 2 +-
 .github/workflows/integration-tests-ui-critical.yml    | 4 +---
 .github/workflows/integration-tests-ui.yml             | 2 +-
 9 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 .github/actionlint.yaml

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
deleted file mode 100644
index 83df0b81ec..0000000000
--- a/.github/actionlint.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Custom runner labels for actionlint (same approach as sentry-cocoa).
-self-hosted-runner:
-  labels:
-    - bitrise_pool_name:tahoe
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6add05cd0..f4ae724df4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,9 +13,7 @@ jobs:
   build:
     # Job name is a required status check in the main branch ruleset; keep it stable.
     name: Build Job ubuntu-latest - Java 17
-    # Runs on Bitrise-hosted runners (same pattern as sentry-cocoa) instead of
-    # GitHub-hosted ubuntu-latest, which ran out of memory during `make preMerge`.
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d25122d59a..e31db87a4e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ concurrency:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: macos-15
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
index ed0fa2539a..d236a64b0c 100644
--- a/.github/workflows/format-code.yml
+++ b/.github/workflows/format-code.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   format-code:
     name: Format Code
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml
index 4bc252f7a3..7cb5c903ca 100644
--- a/.github/workflows/generate-javadocs.yml
+++ b/.github/workflows/generate-javadocs.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   build-and-deploy-javadocs:
     name: Build and deploy Javadocs
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
diff --git a/.github/workflows/integration-tests-macrobenchmark.yml b/.github/workflows/integration-tests-macrobenchmark.yml
index 7ba03815fc..377db931fc 100644
--- a/.github/workflows/integration-tests-macrobenchmark.yml
+++ b/.github/workflows/integration-tests-macrobenchmark.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   macrobenchmark:
     name: Macrobenchmark
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
 
     # we copy the secret to the env variable in order to access it in the workflow
     env:
diff --git a/.github/workflows/integration-tests-size.yml b/.github/workflows/integration-tests-size.yml
index 530f5ea471..ebdad2a4d9 100644
--- a/.github/workflows/integration-tests-size.yml
+++ b/.github/workflows/integration-tests-size.yml
@@ -13,7 +13,7 @@ concurrency:
 jobs:
   build:
     name: Build and Analyze SDK Size
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml
index c793151d3d..27ecbff7d1 100644
--- a/.github/workflows/integration-tests-ui-critical.yml
+++ b/.github/workflows/integration-tests-ui-critical.yml
@@ -20,9 +20,7 @@ env:
 jobs:
   build:
     name: Build
-    # Only the APK build runs on Bitrise; the Maestro job below needs KVM for the
-    # x86_64 emulator, which the macOS Bitrise VMs don't provide.
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
 
     env:
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
diff --git a/.github/workflows/integration-tests-ui.yml b/.github/workflows/integration-tests-ui.yml
index 2483394aa1..2ece76b6b5 100644
--- a/.github/workflows/integration-tests-ui.yml
+++ b/.github/workflows/integration-tests-ui.yml
@@ -12,7 +12,7 @@ concurrency:
 jobs:
   test:
     name: Ui tests
-    runs-on: ["bitrise_pool_name:tahoe"]
+    runs-on: ubuntu-latest
 
     # we copy the secret to the env variable in order to access it in the workflow
     env: