From a1c6ef2b721273f3fc8692ae5fc6405017d52228 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2026 12:26:41 +0000 Subject: [PATCH] Revert "ci: Move Bitrise iOS test jobs to GitHub-hosted macos-26-xlarge runners (#7041)" This reverts commit 43e171440136ed5369b13d4566d4da62bab564f5. Co-Authored-By: Itay Brenner --- .github/workflows/e2e-v2.yml | 8 +++++++- .github/workflows/native-tests.yml | 18 +++++++++++++++--- .github/workflows/sample-application.yml | 9 +++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml index 626771d51a..bb82452c33 100644 --- a/.github/workflows/e2e-v2.yml +++ b/.github/workflows/e2e-v2.yml @@ -215,7 +215,7 @@ jobs: engine: ["hermes"] include: - platform: ios - runs-on: macos-26-xlarge + runs-on: ["bitrise_pool_name:tahoe"] - platform: android runs-on: ubuntu-24.04 @@ -268,6 +268,12 @@ jobs: cache: "yarn" cache-dependency-path: yarn.lock + - name: Setup asdf Node.js (Bitrise) + if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'ios' }} + run: | + asdf global nodejs system + corepack enable + - name: Install Ninja if: ${{ steps.platform-check.outputs.skip != 'true' && matrix.platform == 'android' }} run: sudo apt-get update && sudo apt-get install -y ninja-build diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml index 04c28c0610..6769acb91f 100644 --- a/.github/workflows/native-tests.yml +++ b/.github/workflows/native-tests.yml @@ -33,7 +33,7 @@ jobs: test-ios: name: ios - runs-on: macos-26-xlarge + runs-on: ["bitrise_pool_name:tahoe"] needs: [diff_check, detect-changes] if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.detect-changes.outputs.needs_ios == 'true' }} steps: @@ -48,12 +48,24 @@ jobs: cache: "yarn" cache-dependency-path: yarn.lock + - name: Setup asdf Node.js (Bitrise) + run: | + asdf global nodejs system + corepack enable + - name: Install SDK JS Dependencies run: yarn install - - uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1 + - uses: actions/cache@v6 + name: Cache Ruby (Bitrise) with: - ruby-version: "3.3.0" + path: ~/.asdf/installs/ruby + key: asdf-ruby-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.ruby-version') }} + + - name: Install Ruby (Bitrise) + run: | + asdf install ruby 3.3.0 + asdf local ruby 3.3.0 - name: Install CocoaPods run: gem install cocoapods diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml index eef73e0827..3a859c5157 100644 --- a/.github/workflows/sample-application.yml +++ b/.github/workflows/sample-application.yml @@ -19,7 +19,7 @@ env: IOS_APP_ARCHIVE_PATH: sentry-react-native-sample.app.zip ANDROID_APP_ARCHIVE_PATH: sentry-react-native-sample.apk.zip REACT_NATIVE_SAMPLE_PATH: samples/react-native - IOS_DEVICE: "iPhone 17" + IOS_DEVICE: "iPhone 16" IOS_VERSION: ">=18.0" ANDROID_API_LEVEL: "30" @@ -583,7 +583,7 @@ jobs: test-ios: name: Test ios production REV2 - runs-on: macos-26-xlarge + runs-on: ["bitrise_pool_name:tahoe"] needs: [diff_check, detect-changes, build-ios] if: >- ${{ @@ -619,6 +619,11 @@ jobs: cache: "yarn" cache-dependency-path: yarn.lock + - name: Setup asdf Node.js (Bitrise) + run: | + asdf global nodejs system + corepack enable + - name: Install JS Dependencies run: yarn install