Merge branch 'main' into deps/scripts/update-bundler-plugins.sh

Author: antonis

.github/workflows/sample-application-expo.yml

@@ -44,20 +44,24 @@ jobs:
         build-type: ['dev', 'production']
         include:
           - platform: ios
-            xcode-version: '16.4'
-            runs-on: macos-15
+            runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
           - platform: android
-            runs-on: ubuntu-latest
+            runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
           - platform: web
-            runs-on: ubuntu-latest
+            runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
         exclude:
           - platform: 'android'
             ios-use-frameworks: 'dynamic-frameworks'
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Enable Corepack
-        run: npm i -g corepack
+        run: corepack enable
+
+      - name: Install Ninja
+        if: ${{ matrix.platform == 'android' }}
+        run: sudo apt-get update && sudo apt-get install -y ninja-build
+
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
@@ -81,9 +85,6 @@ jobs:
       - name: Gradle cache
         uses: gradle/gradle-build-action@ac2d340dc04d9e1113182899e983b5400c17cda1 # v3.5.0
 
-      - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
-        if: ${{ matrix.platform == 'ios' }}
-
       - name: Setup Global Xcode Tools
         if: ${{ matrix.platform == 'ios' }}
         run: which xcbeautify || brew install xcbeautify
@@ -137,6 +138,7 @@ jobs:
             -sdk 'iphonesimulator' \
             -destination 'generic/platform=iOS Simulator' \
             ONLY_ACTIVE_ARCH=yes \
+            ARCHS=arm64 \
             -derivedDataPath "$derivedData" \
             build \
             | tee xcodebuild.log \

.github/workflows/sample-application.yml

@@ -53,12 +53,11 @@ jobs:
         build-type: ['dev', 'production']
         include:
           - platform: ios
-            xcode-version: '16.4'
-            runs-on: macos-15
+            runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
           - platform: macos
-            runs-on: macos-15
+            runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
           - platform: android
-            runs-on: ubuntu-latest
+            runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
         exclude:
           - platform: 'android'
             ios-use-frameworks: 'dynamic-frameworks'
@@ -72,7 +71,12 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Enable Corepack
-        run: npm i -g corepack
+        run: corepack enable
+
+      - name: Install Ninja
+        if: ${{ matrix.platform == 'android' }}
+        run: sudo apt-get update && sudo apt-get install -y ninja-build
+
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
@@ -96,11 +100,8 @@ jobs:
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 
-      - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
-        if: ${{ matrix.platform == 'ios' }}
-
       - name: Setup Global Xcode Tools
-        if: ${{ matrix.platform == 'ios' }}
+        if: ${{ matrix.platform == 'ios' || matrix.platform == 'macos' }}
         run: which xcbeautify || brew install xcbeautify
 
       - name: Install SDK Dependencies
@@ -159,6 +160,7 @@ jobs:
             -sdk 'iphonesimulator' \
             -destination 'generic/platform=iOS Simulator' \
             ONLY_ACTIVE_ARCH=yes \
+            ARCHS=arm64 \
             -derivedDataPath "$derivedData" \
             build \
             | tee xcodebuild.log \
@@ -251,6 +253,10 @@ jobs:
         with:
           version: ${{env.MAESTRO_VERSION}}
 
+      - name: Install Ninja
+        if: ${{ matrix.platform == 'android' }}
+        run: sudo apt-get update && sudo apt-get install -y ninja-build
+
       - name: Download iOS App Archive
         if: ${{ matrix.platform == 'ios' }}
         uses: actions/download-artifact@v7
@@ -276,7 +282,8 @@ jobs:
         run: unzip ${{ env.ANDROID_APP_ARCHIVE_PATH }}
 
       - name: Enable Corepack
-        run: npm i -g corepack
+        run: corepack enable
+
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false

.github/workflows/testflight.yml

@@ -14,19 +14,18 @@ jobs:
 
   upload_to_testflight:
     name: Build and Upload React Native Sample to Testflight
-    runs-on: macos-15
+    runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
     needs: [diff_check]
     if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      - run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
       - uses: ruby/setup-ruby@v1
         with:
           working-directory: samples/react-native
           ruby-version: '3.3.0' # based on what is used in the sample
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 1 # cache the installed gems
-      - run: npm i -g corepack
+      - run: corepack enable
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false