From 10aee2e78f4709582f5fba17ec727305c902baef Mon Sep 17 00:00:00 2001
From: Itay Brenner <itay.brenner@sentry.io>
Date: Mon, 29 Jun 2026 17:37:01 -0300
Subject: [PATCH] ci: Migrate Cirrus Ubuntu jobs to GitHub-hosted runners

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/buildandtest.yml | 18 +++++++++---------
 .github/workflows/codegen.yml      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
index 6e8da01568..7b35f93959 100644
--- a/.github/workflows/buildandtest.yml
+++ b/.github/workflows/buildandtest.yml
@@ -17,7 +17,7 @@ jobs:
 
   job_test:
     name: Test
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -36,7 +36,7 @@ jobs:
 
   job_lint:
     name: Lint
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -103,7 +103,7 @@ jobs:
 
   job_check_integrity:
     name: Check package integrity
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -127,7 +127,7 @@ jobs:
 
   job_build:
     name: Build
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -170,7 +170,7 @@ jobs:
 
   job_validate_tarball:
     name: Validate tarball
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [job_build, diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     timeout-minutes: 5
@@ -251,7 +251,7 @@ jobs:
 
   job_type_check:
     name: Type Check Typescript 3.8
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [job_build, diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     env:
@@ -284,7 +284,7 @@ jobs:
         run: yarn type-check
   job_circular_dep_check:
     name: Circular Dependency Check
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [job_build, diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -313,7 +313,7 @@ jobs:
 
   job_api_report:
     name: API Report Check
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [job_build, diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
@@ -338,7 +338,7 @@ jobs:
 
   job_bundle:
     name: Bundle
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [job_test, job_build, diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     strategy:
diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
index f0aa3c47e4..9d629231cd 100644
--- a/.github/workflows/codegen.yml
+++ b/.github/workflows/codegen.yml
@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/skip-ci.yml
 
   codegen:
-    runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04", "runner_group_id:10"]
+    runs-on: ubuntu-latest
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     strategy: