Introducing develop branch (#523)

Author: testableapple

.github/workflows/publish-release.yml

@@ -7,35 +7,26 @@ on:
     types:
       - closed
 
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Provide release version'
-        type: string
-        required: true
-
 jobs:
   release:
     name: Publish new release
     runs-on: macos-13
-    if: github.event_name == 'workflow_dispatch' || startsWith(github.event.pull_request.head.ref, 'release/')
+    if: github.event.pull_request.merged == true # only merged pull requests must trigger this job
     steps:
       - name: Install Bot SSH Key
         uses: webfactory/[email protected]
         with:
           ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }}
       - uses: actions/[email protected]
       - name: Extract version from branch name (for release branches)
+        if: startsWith(github.event.pull_request.head.ref, 'release/')
         run: |
-          if [[ "${{ github.event.inputs.version }}" != "" ]]; then
-            echo "RELEASE_VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV
-          else
-            BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
-            VERSION=${BRANCH_NAME#release/}
-            echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
-          fi
+          BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
+          VERSION=${BRANCH_NAME#release/}
+          echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
       - uses: ./.github/actions/ruby-cache
       - name: "Fastlane - Publish Release"
+        if: startsWith(github.event.pull_request.head.ref, 'release/')
         env:
           GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }}
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

fastlane/Fastfile

@@ -16,7 +16,6 @@ source_packages_path = 'spm_cache'
 buildcache_xcargs = 'CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++'
 is_localhost = !is_ci
 @force_check = false
-develop_branch = 'main'
 
 before_all do |lane|
   if is_ci
@@ -90,6 +89,7 @@ lane :publish_release do |options|
   clean_products
 
   publish_ios_sdk(
+    skip_git_status_check: false,
     version: options[:version],
     sdk_names: sdk_names,
     podspec_names: ['StreamChatSwiftUI', 'StreamChatSwiftUI-XCFramework'],
@@ -208,7 +208,7 @@ end
 
 desc 'Runs e2e ui tests using mock server in Debug config'
 lane :test_e2e_mock do |options|
-  # next unless is_check_required(sources: sources_matrix[:e2e], force_check: @force_check) # TESTING THIS NOW
+  next unless is_check_required(sources: sources_matrix[:e2e], force_check: @force_check)
 
   start_sinatra
 
@@ -434,7 +434,7 @@ lane :copyright do
 end
 
 private_lane :create_pr do |options|
-  options[:base_branch] ||= develop_branch
+  options[:base_branch] ||= 'develop'
   sh("git checkout -b #{options[:head_branch]}")
   sh('git add -A')
   sh("git commit -m '#{options[:title]}'")