ci(fastlane): add retry logic for pod push and missing versioning logic (#610)

Author: iartemiev

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 
 defaults: &defaults
   macos:
-    xcode: "11.4.0"
+    xcode: '11.4.1'
   working_directory: ~/amplify-ios
   environment:
     BUNDLE_PATH: vendor/bundle
@@ -44,8 +44,8 @@ commands:
     steps:
       - restore_cache:
           keys:
-            - v1-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
-            - v1-gems-
+            - v2-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
+            - v2-gems-
 
   check_bundle:
     steps:
@@ -96,7 +96,7 @@ jobs:
             BUNDLE_JOBS: 4
             BUNDLE_RETRY: 3
       - save_cache:
-          key: v1-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
+          key: v2-gems-{{ checksum "~/amplify-ios/Gemfile.lock" }}
           paths:
             - vendor/bundle
 
@@ -152,19 +152,19 @@ jobs:
     parameters:
       lane:
         type: string
-        default: "unstable"
+        default: 'unstable'
     description: deploy pods to trunk
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "80:9a:29:87:ac:5f:1a:9b:c5:a4:3d:37:c1:10:87:2f"
+            - '80:9a:29:87:ac:5f:1a:9b:c5:a4:3d:37:c1:10:87:2f'
       - *restore_repo
       - restore_gems
       - check_bundle
       - run:
           name: Release pods
           command: bundle exec fastlane << parameters.lane >>
-          no_output_timeout: 20m
+          no_output_timeout: 60m
 
 deploy_requires: &deploy_requires
   requires:

Gemfile.lock

@@ -1,10 +1,10 @@
 GIT
   remote: https://github.com/aws-amplify/amplify-ci-support
-  revision: d6ccaffae0c1fd6426d9209fffa04f7300377726
+  revision: e484c7fb9ee9b156f450af83a282cc1a31a74c5d
   branch: master
   glob: src/fastlane/release_actions/*.gemspec
   specs:
-    fastlane-plugin-release_actions (1.0.3)
+    fastlane-plugin-release_actions (1.0.4)
 
 GEM
   remote: https://rubygems.org/
@@ -22,16 +22,16 @@ GEM
       json (>= 1.5.1)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.337.0)
-    aws-sdk-core (3.102.1)
+    aws-partitions (1.339.0)
+    aws-sdk-core (3.103.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.35.0)
+    aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.72.0)
+    aws-sdk-s3 (1.73.0)
       aws-sdk-core (~> 3, >= 3.102.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -83,11 +83,12 @@ GEM
     concurrent-ruby (1.1.6)
     declarative (0.0.20)
     declarative-option (0.1.0)
-    digest-crc (0.5.1)
+    digest-crc (0.6.1)
+      rake (~> 13.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
-    emoji_regex (1.0.1)
+    emoji_regex (3.0.0)
     escape (0.0.4)
     ethon (0.12.0)
       ffi (>= 1.3.0)
@@ -100,16 +101,16 @@ GEM
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.1.7)
-    fastlane (2.149.1)
+    fastlane (2.151.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.2, < 2.0.0)
+      babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
       commander-fastlane (>= 4.4.6, < 5.0.0)
       dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 2.0)
+      emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
       faraday (>= 0.17, < 2.0)
       faraday-cookie_jar (~> 0.0.6)
@@ -120,13 +121,11 @@ GEM
       google-cloud-storage (>= 1.15.0, < 2.0.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
-      jwt (~> 2.1.0)
+      jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multi_xml (~> 0.5)
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
-      public_suffix (~> 2.0.0)
-      rubyzip (>= 1.3.0, < 2.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -178,30 +177,30 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.3.1)
-    jwt (2.1.0)
+    jwt (2.2.1)
     memoist (0.16.2)
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     minitest (5.14.1)
     molinillo (0.6.6)
     multi_json (1.14.1)
-    multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.6)
     nap (1.1.0)
     naturally (2.2.0)
     netrc (0.11.0)
     os (1.1.0)
     plist (3.5.0)
-    public_suffix (2.0.5)
+    public_suffix (4.0.5)
+    rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
     rouge (2.0.7)
     ruby-macho (1.4.0)
-    rubyzip (1.3.0)
+    rubyzip (2.3.0)
     security (0.1.3)
     signet (0.14.0)
       addressable (~> 2.3)
@@ -251,4 +250,4 @@ DEPENDENCIES
   xcpretty
 
 BUNDLED WITH
-   1.17.2
+   2.1.2

fastlane/Fastfile

@@ -33,8 +33,6 @@ platform :ios do
 
     changelog = build_changelog(version: next_version, commits: commits)
 
-    write_changelog(changelog: changelog, path: 'CHANGELOG.md')
-
     # Commit and push 
     release_commit(version: next_version)
 
@@ -43,6 +41,8 @@ platform :ios do
 
     # Push pods
     release_pods()
+
+    post_release(version: next_version, changelog: changelog)
   end
 
   desc "Increment versions"
@@ -61,7 +61,10 @@ platform :ios do
       plist_paths.each do |plist_path|
         set_info_plist_value(path: plist_path, key: PLIST_KEY, value: version)
       end
-    end
+
+      # One-offs
+      set_key_value(file: "AmplifyPlugins/Core/AWSPluginsCore/ServiceConfiguration/AmplifyAWSServiceConfiguration.swift", key: "version", value: version)
+      set_key_value(file: "build-support/dependencies.rb", key: "AMPLIFY_VERSION", value: version)
   end
 
   desc "Commit and push"
@@ -73,8 +76,9 @@ platform :ios do
 
     commit_message = "chore: release #{next_version} [skip ci]"
     sh('git', 'commit', '-am', commit_message)
+
+    # push to origin
     sh('git', 'push', 'origin', 'release')
-    sh('git', 'push', 'origin', 'release:main')
   end
 
   desc "Tag in git and push to GitHub"
@@ -89,26 +93,67 @@ platform :ios do
   desc "Release pods"
   private_lane :release_pods do
     AmplifyPods.pods.each do |pod|
-      pod_path = "/Users/distiller/amplify-ios/#{pod[:spec]}"
+      if pod[:no_push]
+        UI.message "Skipping pushing pod #{pod[:spec]}"
+        next
+      end
 
-      UI.message("Pushing pod #{pod[:spec]}")
+      pod_path = "#{ENV['CIRCLE_WORKING_DIRECTORY']}/#{pod[:spec]}"
 
-      dupe_error = "[!] Unable to accept duplicate entry"
+      UI.message "Pushing pod #{pod[:spec]}"
 
-      begin
-        sh('bundle', 'exec', 'pod', 'trunk', 'push', pod_path, '--allow-warnings', '--synchronous')
-      rescue => ex
-        unless ex.to_s.include? dupe_error
-          raise Exception.new "Unrecoverable error in pod push trunk"
+      with_retry do
+        begin
+          pod_push(path: pod[:spec], allow_warnings: true, synchronous: true)
+        rescue exception
+          raise exception unless exception.message =~ /Unable to accept duplicate entry/i
+          UI.warn("Version already exists. Ignoring")
         end
       end
 
-      # TODO: utilize action once the PR for adding `synchronous` options has been merged
-      # https://github.com/fastlane/fastlane/pull/16698
-      # pod_push(path: pod[:spec], allow_warnings: true, synchronous: true)
-
       # This shouldn't be necessary... but it is
       sh('bundle', 'exec', 'pod', 'repo', 'update')
     end
   end
+
+  desc "Post-release"
+  private_lane :post_release do |options|
+    version = options[:version].to_s
+    changelog = options[:changelog]
+    tag = "v#{version}"
+    # increment plugin lock files by calling pod update on each
+    plugin_root = "#{ENV['CIRCLE_WORKING_DIRECTORY']}/AmplifyPlugins"
+  
+    sh('bundle', 'exec', 'pod', 'repo', 'update')
+
+    AmplifyPods.plugins.each do |plugin|
+      path = "#{plugin_root}/#{plugin}"
+      Dir.chdir(path){ sh('pod', 'update') }
+    end
+
+    write_changelog(changelog: changelog, path: 'CHANGELOG.md')
+
+    commit_message = "chore: finalize release #{version} [skip ci]"
+    sh('git', 'commit', '-am', commit_message)
+
+    add_git_tag(tag: tag, force: true)
+    push_git_tags(tag: tag, force: true)
+
+    # push to origin
+    sh('git', 'push', 'origin', 'release')
+    sh('git', 'push', 'origin', 'release:main')
+  end
 end
+
+def with_retry(retries=5, wait=10)
+  begin
+    yield
+  rescue e
+    retries -= 1
+    raise e if retries.zero?
+      UI.error("Error occurred: #{exception}; retrying...")
+      sleep(wait)
+    retry
+    end
+  end
+end

fastlane/amplify_pods.rb

@@ -15,9 +15,9 @@ module AmplifyPods
       spec: "AWSPluginsCore.podspec",
       constants: ['AMPLIFY_VERSION'],
       plist_paths: [
+        "AmplifyPlugins/Core/AWSPluginsTestCommon/Info.plist",
         "AmplifyPlugins/Core/AWSPluginsCore/Info.plist",
-        "AmplifyPlugins/Core/AWSPluginsCoreTests/Info.plist",
-        "AmplifyPlugins/Core/AWSPluginsTestCommon/Info.plist"
+        "AmplifyPlugins/Core/AWSPluginsCoreTests/Info.plist"
       ]
     },
     {
@@ -40,11 +40,23 @@ module AmplifyPods
       plist_paths: [
         "AmplifyPlugins/Analytics/AWSPinpointAnalyticsPlugin/Resources/Info.plist",
         "AmplifyPlugins/API/AWSAPICategoryPlugin/Info.plist",
+        "AmplifyPlugins/Auth/AWSCognitoAuthPlugin/Resources/Info.plist",
+        "AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Info.plist",
         "AmplifyPlugins/Storage/AWSS3StoragePlugin/Resources/Info.plist"
       ]
+    },
+    {
+      spec: "AmplifyTestCommon.podspec",
+      constants: ['AMPLIFY_VERSION'],
+      plist_paths: [],
+      no_push: true
     }
   ]
+  @@plugins = ['API', 'Analytics', 'Auth', 'DataStore', 'Predictions', 'Storage']
   def self.pods
     @@pods
   end
+  def self.plugins
+    @@plugins
+  end
 end