Reorganize pipeline

Author: andrewdmontgomery

.buildkite/pipeline.yml

@@ -106,23 +106,22 @@ steps:
         label: "🛠️ Build Demo (Swift $SWIFT_6_0_SWIFT_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