Merge branch 'main' into storage-get-url-change

Author: harsh62

.github/composite_actions/get_platform_parameters/action.yml

@@ -5,7 +5,7 @@ inputs:
     required: true
     type: string
   xcode_version:
-    description: "The version of Xcode. Available aliases are 'latest', 'minimum', and 'beta'"
+    description: "The version of Xcode. Available aliases are 'latest' and 'minimum'"
     default: 'latest'
     type: string
   destination:
@@ -41,9 +41,8 @@ runs:
 
     - id: get-xcode-version
       run: |
-        LATEST_XCODE_VERSION=16.4.0
+        LATEST_XCODE_VERSION=26.3
         MINIMUM_XCODE_VERSION=16.0.0
-        DEFAULT_BETA_XCODE_VERSION=26.0_beta
 
         INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
 
@@ -52,17 +51,6 @@ runs:
             XCODE_VERSION=$LATEST_XCODE_VERSION ;;
           minimum)
             XCODE_VERSION=$MINIMUM_XCODE_VERSION ;;
-          beta)
-            # Try to auto-detect installed Xcode 26 beta app name
-            DETECTED=$(ls -1 /Applications 2>/dev/null | grep -E '^Xcode_26.*\.app$' | head -n1 || true)
-            if [ -n "$DETECTED" ]; then
-              # strip prefix and suffix to get the version token used in the path template
-              # e.g., Xcode_26.0_beta.app -> 26.0_beta
-              XCODE_VERSION=$(echo "$DETECTED" | sed -E 's/^Xcode_//; s/\.app$//')
-            else
-              XCODE_VERSION=$DEFAULT_BETA_XCODE_VERSION
-            fi
-            ;;
           *)
             XCODE_VERSION=$INPUT_XCODE_VERSION ;;
         esac
@@ -77,69 +65,53 @@ runs:
         INPUT_XCODE_VERSION=${{ inputs.xcode_version }}
 
         case $INPUT_PLATFORM/$INPUT_XCODE_VERSION in
-          iOS/latest) 
+          iOS/latest)
             DEVICE="iPhone 16 Pro Max"
-            OS_VERSION="18.5"
-            ;;
-          iOS/beta)
-            DEVICE="iPhone 16"
-            OS_VERSION="26.0"
+            OS_VERSION="26.2"
             ;;
           iOS/minimum)
             DEVICE="iPhone 16 Pro Max"
             OS_VERSION="18.0"
             ;;
           iOS/*)
             DEVICE="iPhone 16 Pro Max"
-            OS_VERSION="18.5"
+            OS_VERSION="26.2"
             ;;
           tvOS/latest)
             DEVICE="Apple TV 4K (3rd generation)"
-            OS_VERSION="18.5"
-            ;;
-          tvOS/beta)
-            DEVICE="Apple TV 4K (3rd generation)"
-            OS_VERSION="26.0"
+            OS_VERSION="26.2"
             ;;
           tvOS/minimum)
             DEVICE="Apple TV 4K (3rd generation)"
             OS_VERSION="18.0"
             ;;
           tvOS/*)
             DEVICE="Apple TV 4K (3rd generation)"
-            OS_VERSION="18.5"
+            OS_VERSION="26.2"
             ;;
           watchOS/latest)
             DEVICE="Apple Watch Series 10 (46mm)"
-            OS_VERSION="11.5"
-            ;;
-          watchOS/beta)
-            DEVICE="Apple Watch Series 10 (46mm)"
-            OS_VERSION="26.0"
+            OS_VERSION="26.2"
             ;;
           watchOS/minimum)
             DEVICE="Apple Watch SE (44mm) (2nd generation)"
             OS_VERSION="11.0"
             ;;
           watchOS/*)
-            DEVICE="iPhone 16 Pro Max"
-            OS_VERSION="18.5"
+            DEVICE="Apple Watch Series 10 (46mm)"
+            OS_VERSION="26.2"
             ;;
           visionOS/latest)
             DEVICE="Apple Vision Pro"
-            OS_VERSION="2.5"
-            ;;
-          visionOS/beta)
-            DEVICE="Apple Vision Pro"
-            OS_VERSION="26.0"
+            OS_VERSION="26.2"
             ;;
           visionOS/minimum)
             DEVICE="Apple Vision Pro"
             OS_VERSION="2.0"
             ;;
           visionOS/*)
             DEVICE="Apple Vision Pro"
-            OS_VERSION="2.5"
+            OS_VERSION="26.2"
             ;;
         esac
 

.github/workflows/build_xcode_beta.yml

@@ -17,13 +17,13 @@ jobs:
       matrix:
         include:
           - os: macos-15
-            xcode-version: '16.4.0'
+            xcode-version: '26.3'
             device: 'iPhone 16 Pro Max'
-            version: '18.5'
+            version: '26.2'
           - os: macos-15
-            xcode-version: '16.0.0'
+            xcode-version: '16.4.0'
             device: 'iPhone 16 Pro Max'
-            version: '18.0'
+            version: '18.5'
     name: Canary Test - Xcode ${{ matrix.xcode-version }}
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/canary.yml

@@ -1,6 +1,8 @@
 name: Integration Tests (Except DataStore & API)
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [main]
   push:
     branches: [main]
 

.github/workflows/integ_test.yml

@@ -1,6 +1,8 @@
 name: Integration Tests | API - All
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [main]
   push:
     branches: [main]
 
@@ -9,7 +11,7 @@ permissions:
     contents: read
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ github.ref_name != 'main'}}
 
 jobs:

.github/workflows/integ_test_api.yml

@@ -1,6 +1,8 @@
 name: Integration Tests | DataStore - All
 on:
   workflow_dispatch:
+  pull_request:
+    branches: [main]
   push:
     branches: [main]
 
@@ -9,7 +11,7 @@ permissions:
     contents: read
 
 concurrency:
-  group: ${{ github.head_ref || github.run_id }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: ${{ github.ref_name != 'main'}}
 
 jobs: