chore: Add steps to do unstable release in main (#2477)

Author: royjit

.circleci/config.yml

@@ -99,7 +99,7 @@ orbs:
 defaults: &defaults
   macos:
     xcode: '14.0.0'
-  working_directory: ~/amplify-ios
+  working_directory: ~/amplify-swift
   environment:
     BUNDLE_PATH: vendor/bundle
 
@@ -119,7 +119,7 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v2-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
+            - v2-gems-{{ checksum "~/amplify-swift/Gemfile.lock" }}
             - v2-gems-
 
   check_bundle:
@@ -148,7 +148,7 @@ jobs:
       - save_cache:
           key: *repo_cache_key
           paths:
-            - ~/amplify-ios
+            - ~/amplify-swift
 
   install_gems:
     <<: *defaults
@@ -162,7 +162,7 @@ jobs:
             BUNDLE_JOBS: 4
             BUNDLE_RETRY: 3
       - save_cache:
-          key: v2-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
+          key: v2-gems-{{ checksum "~/amplify-swift/Gemfile.lock" }}
           paths:
             - vendor/bundle
 
@@ -207,7 +207,7 @@ jobs:
           command: xcodebuild test -scheme <<parameters.scheme>> -sdk << parameters.sdk >> -destination "<<parameters.destination>>"  | tee "artifacts/test-<< parameters.scheme >>-<< parameters.sdk >>.log" | xcpretty --simple --color --report junit
       - run:
           name: Upload << parameters.scheme >> coverage report to Codecov
-          command: bash ~/amplify-ios/build-support/codecov.sh -F << parameters.scheme >>_unit_test -J '^<< parameters.scheme >>$'
+          command: bash ~/amplify-swift/build-support/codecov.sh -F << parameters.scheme >>_unit_test -J '^<< parameters.scheme >>$'
       - store_test_results:
           path: build/reports
       - upload_artifacts
@@ -220,15 +220,15 @@ jobs:
       - check_bundle
       - run:
           name: Jazzy API doc generation
-          command: bash ~/amplify-ios/CircleciScripts/jazzy_doc_gen.sh
+          command: bash ~/amplify-swift/CircleciScripts/jazzy_doc_gen.sh
 
   deploy:
     <<: *defaults
     parameters:
       lane:
         type: string
         default: 'unstable'
-    description: deploy pods to trunk
+    description: deploy new release
     steps:
       - add_ssh_keys:
           fingerprints:
@@ -237,13 +237,14 @@ jobs:
       - restore_gems
       - check_bundle
       - run:
-          name: Release pods
+          name: Release Amplify for Swift
           command: bundle exec fastlane << parameters.lane >>
           no_output_timeout: 60m
 
 deploy_requires: &deploy_requires
   requires:
-    - build_amplify_spm
+    - build_amplify_ios_spm
+    - build_amplify_macos_spm
     - ios_unit_test_amplify
     - ios_unit_test_awspluginscore
     - ios_unit_test_analytics
@@ -389,7 +390,13 @@ workflows:
           destination: << pipeline.parameters.macos-destination >>
           requires:
             - build_amplify_macos_spm
-      
+      - deploy:
+          name: deploy unstable
+          <<: *deploy_requires
+          filters:
+            branches:
+              only:
+                - main 
 
   # Scheduled smoke test workflow
   # Jobs are pulled from the getting-started-smoke-test inline orb defined below

fastlane/Fastfile

@@ -1,8 +1,6 @@
 opt_out_usage
 default_platform(:ios)
 
-PLIST_KEY = "CFBundleShortVersionString"
-
 platform :ios do
   before_all do 
     # Perform a fetch before inferring the next version 
@@ -78,7 +76,6 @@ platform :ios do
     version = options[:version].to_s
     changelog = options[:changelog]
     tag = "v#{version}"
-    plugin_root = File.expand_path("#{ENV['CIRCLE_WORKING_DIRECTORY']}/AmplifyPlugins")
 
     sh('bundle', 'exec', 'swift', 'package', 'update')
 
@@ -95,15 +92,3 @@ platform :ios do
     sh('git', 'push', 'origin', 'release:main')
   end
 end
-
-def with_retry(retries=5, wait=60)
-  begin
-    yield
-  rescue StandardError => e
-    retries -= 1
-    raise e if retries.zero?
-      UI.error("Error occurred: #{e}; retrying...")
-      sleep(wait)
-    retry
-  end
-end