Adds an approval job that will tag the release

.circleci/config.yml

@@ -90,6 +90,19 @@ commands:
           name: Install xcbeautify
           command: brew install xcbeautify
 
+  install-rubydocker-dependencies:
+    steps:
+      - restore_cache:
+          keys: 
+            - v1-rubydocker-gem-cache-{{ checksum "Gemfile.lock" }}
+      - run: 
+          name: Bundle install
+          command: bundle install --clean --path vendor/bundle
+      - save_cache:
+          key: v1-rubydocker-gem-cache-{{ checksum "Gemfile.lock" }}
+          paths:
+            - vendor/bundle
+
   compress_result_bundle:
     parameters:
       directory:
@@ -160,7 +173,15 @@ commands:
           directory: << parameters.directory >>
       - scan-and-archive:
           directory: << parameters.directory >>
-
+
+  setup-git-credentials:
+     steps:
+       - run:
+           name: Setup Git config
+           command: |
+             git config user.email $GIT_EMAIL
+             git config user.name $GIT_USERNAME
+
   trust-github-key:
     steps:
       - run:
@@ -487,19 +508,24 @@ jobs:
     shell: /bin/bash --login -o pipefail
     steps:
       - checkout
-      - restore_cache:
-          keys: 
-            - v1-danger-gem-cache-{{ checksum "Gemfile.lock" }}
-      - run: 
-          name: Bundle install
-          command: bundle install --clean --path vendor/bundle
-      - save_cache:
-          key: v1-danger-gem-cache-{{ checksum "Gemfile.lock" }}
-          paths:
-            - vendor/bundle
+      - install-rubydocker-dependencies
       - run: 
           name: Run Danger
           command: bundle exec danger --verbose
+
+  tag-release-branch:
+    docker:
+      - image: cimg/ruby:3.1.2
+    working_directory: ~/purchases-ios
+    shell: /bin/bash --login -o pipefail
+    steps:
+      - checkout
+      - setup-git-credentials
+      - trust-github-key
+      - install-rubydocker-dependencies
+      - run: 
+          name: Tag branch
+          command: bundle exec fastlane tag_current_branch
 
 workflows:
   version: 2
@@ -546,6 +572,13 @@ workflows:
           <<: *release-tags-and-branches
   deploy:
     jobs:
+      - hold:
+          type: approval
+          <<: *release-branches
+      - tag-release-branch:
+          requires:
+            - hold
+          <<: *release-branches
       - make-release:
           xcode_version: '13.4.1'
           <<: *release-tags

Contributing/RELEASING.md

@@ -4,5 +4,6 @@
     1. Input new version number
     2. Update CHANGELOG.latest.md to include the latest changes. Call out API changes (if any). You can use the existing CHANGELOG.md as a base for formatting. To compile the changelog, you can compare the changes between the base branch for the release (usually main) against the latest release, by checking https://github.com/revenuecat/purchases-ios/compare/<latest_release>...<base_branch>. For example, https://github.com/revenuecat/purchases-ios/compare/4.1.0...main. 
     3. A new branch and PR will automatically be created
-3. Merge PR when approved
-4. Make a tag and push, the rest will be performed automatically by CircleCI. If the automation fails, you can revert to manually calling `bundle exec fastlane deploy`.
+3. When the PR is approved, approve the hold job created in CircleCI. CircleCI will create a tag for the version. Alternatively, you can tag the last commit in the release branch and push it to the repository.
+4. The rest will be performed automatically by CircleCI. If the automation fails, you can revert to manually calling `bundle exec fastlane deploy`.
+5. The release branch PR can be merged after the release is completed.

fastlane/Fastfile

@@ -223,6 +223,15 @@ platform :ios do
     github_release(version: version_number)
   end
 
+  desc "Tag current branch with current version number"
+  lane :tag_current_branch do |options|
+    version_number = current_version_number
+    check_no_git_tag_exists(version_number)
+
+    add_git_tag(tag: version_number)
+    push_git_tags(tag: version_number)
+  end
+
   desc "Checks whether the RevenueCat-Swift.h is up to date"
   private_lane :check_autogenerated_header_up_to_date do |options|
     ensure_git_status_clean

fastlane/README.md

@@ -154,6 +154,14 @@ replace API KEY for installation and integration tests
 
 Release to CocoaPods, create Carthage archive, export XCFramework, and create GitHub release
 
+### ios tag_current_branch
+
+```sh
+[bundle exec] fastlane ios tag_current_branch
+```
+
+Tag current branch with current version number
+
 ### ios compile_autogenerated_header
 
 ```sh