Reorganize pipeline

Author: andrewdmontgomery

.buildkite/pipeline.yml

@@ -47,7 +47,7 @@ steps:
   #################
   - group: "📦 Build and Test Swift Package"
     steps:
-      - label: "📦 Build and Test Swift Package (Swift $SWIFT_6_0_SWIFT_VERSION)"
+      - label: "📦 Build and Test Swift Package (Swift $SWIFT_6_0_VERSION)"
         command: |
           validate_swift_package test device_model:"$SWIFT_6_0_DEVICE" os:"$SWIFT_6_0_OS"
         key: "test_swift_current"
@@ -69,7 +69,7 @@ steps:
   - group: "🔬 Validate Podspecs"
     steps:
       - <<: *validate_pods
-        label: "🔬 Validate Podspecs (Swift $SWIFT_6_0_SWIFT_VERSION)"
+        label: "🔬 Validate Podspecs (Swift $SWIFT_6_0_VERSION)"
         key: "validate"
         env:
           IMAGE_ID: "$SWIFT_6_0_IMAGE_ID"
@@ -103,26 +103,25 @@ steps:
       # Build/Upload Demo
       ###################
       - <<: *demo_build
-        label: "🛠️ Build Demo (Swift $SWIFT_6_0_SWIFT_VERSION)"
+        label: "🛠️ Build Demo (Swift $SWIFT_6_0_VERSION)"
         key: build_demo
         depends_on: test_swift_current
-        env:
-          IMAGE_ID: "$SWIFT_6_0_IMAGE_ID"
         artifact_paths: # Archive artifacts only for the production version of Swift
           - ".build/artifacts/*.ipa"
           - ".build/artifacts/*.dSYM.zip"
 
+      - label: "⬆️ Upload Demo to App Center"
+        depends_on: build_demo
+        plugins: [$CI_TOOLKIT]
+        command: .buildkite/commands/upload-to-appcenter.sh
+        if: build.pull_request.id != null
+
+      ###################
+      # Build Demo Distribution for older supported versions of Swift
+      ###################
       - <<: *demo_build
         label: "🛠️ Build Demo (Swift $SWIFT_5_10_VERSION)"
         key: build_swift_5_10
         depends_on: test_swift_5_10
         env:
           IMAGE_ID: "$SWIFT_5_10_IMAGE_ID"
-
-      - label: "⬆️ Upload Demo to App Center"
-        depends_on: build_demo
-        plugins: [$CI_TOOLKIT]
-        env:
-          IMAGE_ID: "$SWIFT_6_0_IMAGE_ID"  # Upload only the production version of Swift
-        command: .buildkite/commands/upload-to-appcenter.sh
-        if: build.pull_request.id != null

.buildkite/shared-pipeline-vars

@@ -10,7 +10,7 @@ export CI_TOOLKIT="automattic/a8c-ci-toolkit#3.2.2"
 export SWIFT_6_0_IMAGE_ID="xcode-16.2-macos-14.7.1-v1"
 export SWIFT_6_0_VERSION="6_0"  # Use `_` instead of `.` since these are used in labels
 export SWIFT_6_0_DEVICE="default"  # Use the default value in Fastlane
-export SWIFT_6_0_OS="18.0"
+export SWIFT_6_0_OS="18.2"
 
 # Swift 5.10
 export SWIFT_5_10_IMAGE_ID="xcode-15.4"