chore: improvement to github build action

.circleci/config.yml

@@ -297,7 +297,7 @@ commands:
       - run: *update-fastlane-android
       - run:
           name: Fastlane Play Store Upload
-          command: bundle exec fastlane android beta official:<< parameters.official >>
+          command: bundle exec fastlane android beta_circle_ci official:<< parameters.official >>
           working_directory: android
 
   # EXPERIMENTAL ONLY
@@ -314,7 +314,7 @@ commands:
       - run: *update-fastlane-android
       - run:
           name: Fastlane Play Store Upload
-          command: bundle exec fastlane android internal_app_sharing
+          command: bundle exec fastlane android internal_app_sharing_circle_ci
           working_directory: android
 
   # EXPERIMENTAL ONLY
@@ -332,7 +332,7 @@ commands:
       - run: *update-fastlane-android
       - run:
           name: Fastlane Play Store Upload
-          command: bundle exec fastlane android production
+          command: bundle exec fastlane android production_circle_ci
           working_directory: android
 
   upload-to-testflight:
@@ -354,7 +354,7 @@ commands:
           name: Fastlane Tesflight Upload
           command: |
             echo $APP_STORE_CONNECT_API_KEY_BASE64 | base64 --decode > ./fastlane/app_store_connect_api_key.p8
-            bundle exec fastlane ios beta official:<< parameters.official >>
+            bundle exec fastlane ios beta_circle_ci official:<< parameters.official >>
           working_directory: ios
       - save_cache: *save-gems-cache
 
@@ -714,14 +714,4 @@ workflows:
           requires:
             - android-hold-google-play-beta-official
 
-      # Android Automatic Experimental
-      - android-automatic-build-experimental:
-          filters:
-            branches:
-              only:
-                - develop
-          requires:
-            - lint-testunit
-      - android-google-play-production-experimental:
-          requires:
-            - android-automatic-build-experimental
+

.github/actions/generate-version-code/action.yml

@@ -1,6 +1,38 @@
 name: Generate Version Code
 description: Generates version code from GitHub run number
 
+inputs:
+  official:
+    type: boolean
+    required: true
+  os:
+    type: string
+    required: true
+  FASTLANE_GOOGLE_SERVICE_ACCOUNT:
+    type: string
+    required: true
+  APP_STORE_CONNECT_API_KEY_BASE64:
+    type: string
+    required: true
+  MATCH_KEYCHAIN_NAME:
+    type: string
+    required: false
+  MATCH_KEYCHAIN_PASSWORD:
+    type: string
+    required: false
+  MATCH_PASSWORD:
+    type: string
+    required: false
+  APP_STORE_CONNECT_API_KEY_ID:
+    type: string
+    required: false
+  APP_STORE_CONNECT_API_KEY_ISSUER_ID:
+    type: string
+    required: false
+  FASTLANE_REPO_PAT:
+    type: string
+    required: false
+
 outputs:
   VERSIONCODE:
     description: "Generated version code"
@@ -9,16 +41,73 @@ outputs:
 runs:
   using: "composite"
   steps:
+    - name: Set up Xcode
+      if: ${{ inputs.os == 'ios' }}
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '16.2'
+
+    - name: Set up Ruby and Bundler
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7.7
+        bundler-cache: true
+
+    - name: Install Fastlane
+      if: ${{ inputs.os == 'android' }}
+      working-directory: android
+      run: |
+        bundle install --path gems
+      shell: bash
+
+    - name: Store the Google service account key
+      if: ${{ inputs.os == 'android' }}
+      working-directory: android
+      run: |
+        echo "${{ inputs.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}" | base64 --decode > service_account.json
+      shell: bash
+
+    - name: Decode p8
+      if: ${{ inputs.os == 'ios' }}
+      run: |
+        echo ${{ inputs.APP_STORE_CONNECT_API_KEY_BASE64 }} | base64 --decode > ./ios/fastlane/app_store_connect_api_key.p8
+      shell: bash
+
+    - name: Compute VERSIONCODE (iOS)
+      id: compute-versioncode-ios
+      if: ${{ inputs.os == 'ios' }}
+      shell: bash
+      run: |
+        VERSIONCODE=$(bundle exec fastlane ios get_testflight_version | grep 'VERSIONCODE=' | cut -d '=' -f2)
+        echo "LATEST_VERSIONCODE=$VERSIONCODE" >> $GITHUB_OUTPUT
+      working-directory: ios
+      env:
+        MATCH_KEYCHAIN_NAME: ${{ inputs.MATCH_KEYCHAIN_NAME }}
+        MATCH_KEYCHAIN_PASSWORD: ${{ inputs.MATCH_KEYCHAIN_PASSWORD }}
+        MATCH_PASSWORD: ${{ inputs.MATCH_PASSWORD }}
+        APP_STORE_CONNECT_API_KEY_ID: ${{ inputs.APP_STORE_CONNECT_API_KEY_ID }}
+        APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ inputs.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+        FASTLANE_REPO_PAT: ${{ inputs.FASTLANE_REPO_PAT }}
+
+    - name: Compute VERSIONCODE (Android)
+      id: compute-versioncode-android
+      if: ${{ inputs.os == 'android' }}
+      shell: bash
+      run: |
+        VERSIONCODE=$(bundle exec fastlane android version_code | grep 'VERSIONCODE=' | cut -d '=' -f2)
+        echo "LATEST_VERSIONCODE=$VERSIONCODE" >> $GITHUB_OUTPUT
+      working-directory: android
+
     - name: Compute VERSIONCODE
       id: compute
       shell: bash
-      env:
-        GITHUB_RUN_NUMBER: ${{ github.run_number }}
       run: |
-        # This offset is from CircleCI after we migrated to Github Actions in order to have sequential builds
+        VERSION_IOS="${{ steps.compute-versioncode-ios.outputs.LATEST_VERSIONCODE }}"
+        VERSION_ANDROID="${{ steps.compute-versioncode-android.outputs.LATEST_VERSIONCODE }}"
 
-        OFFSET=87750
-        VERSIONCODE=$((OFFSET + GITHUB_RUN_NUMBER))
+        LATEST_VERSIONCODE="${VERSION_IOS:-$VERSION_ANDROID}"
+
+        VERSIONCODE=$((LATEST_VERSIONCODE + 1))
         echo "VERSIONCODE=$VERSIONCODE" >> $GITHUB_OUTPUT
 
         echo "### 📦 Version Code Generated" >> $GITHUB_STEP_SUMMARY

.github/actions/upload-android/action.yml

@@ -13,6 +13,10 @@ inputs:
   VERSIONCODE:
     description: 'Version code for build'
     required: true
+  trigger:
+    description: 'Trigger for build'
+    required: true
+    default: pr
 
 runs:
   using: "composite"
@@ -52,10 +56,20 @@ runs:
     - name: Fastlane Play Store Upload
       working-directory: android
       run: |
-        bundle exec fastlane android beta official:${{ inputs.type == 'official' }}
+        if [[ ${{ inputs.trigger }} == "pr" ]]; then
+          bundle exec fastlane android beta official:${{ inputs.type == 'official' }}
+        fi
+        if [[ ${{ inputs.trigger }} == "develop" ]] && [[ ${{ inputs.type }} == 'experimental' ]]; then
+          bundle exec fastlane android experimental_production
+        fi
+        if [[ ${{ inputs.trigger }} == "develop" ]] && [[ ${{ inputs.type }} == 'official' ]]; then
+          bundle exec fastlane android official_open_testing
+        fi
+
       shell: bash
 
     - name: Leave a comment on PR
+      if: ${{ inputs.trigger == 'pr' }}
       env:
         GH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
         PR_NUMBER: ${{ github.event.pull_request.number }}

.github/actions/upload-internal-android/action.yml

@@ -13,7 +13,11 @@ inputs:
   VERSIONCODE:
     description: 'Version code for build'
     required: true
-
+  trigger:
+    description: 'Trigger for build'
+    required: false
+    default: pr
+
 runs:
   using: "composite"
   steps:
@@ -75,6 +79,7 @@ runs:
       shell: bash
 
     - name: Share Internal App Sharing Link
+      if: ${{ inputs.trigger == 'pr' }}
       env:
         GH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
         PR_NUMBER: ${{ github.event.pull_request.number }}

.github/actions/upload-ios/action.yml

@@ -28,6 +28,10 @@ inputs:
   GITHUB_TOKEN:
     description: 'GitHub token for commenting'
     required: true
+  trigger:
+    description: 'Trigger for build'
+    required: false
+    default: pr
 
 runs:
   using: "composite"
@@ -138,6 +142,7 @@ runs:
       shell: bash
 
     - name: Comment on PR with TestFlight Info
+      if: ${{ inputs.trigger == 'pr' }}
       env:
         GH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
         PR_NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/build-android.yml

@@ -6,11 +6,16 @@ on:
       type:
         type: string
         required: true
+      trigger:
+        type: string
+        required: false
+        default: pr
 
 jobs:
   build-hold:
     name: Hold
     runs-on: ubuntu-latest
+    if: ${{ inputs.trigger == 'pr' }}
     environment: experimental_android_build
     steps:
       - run: echo "Waiting for manual approval..."
@@ -19,7 +24,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     needs: [build-hold]
-    if: ${{ inputs.type == 'experimental' }}
+    if: ${{ inputs.type == 'experimental' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
     outputs:
       VERSIONCODE: ${{ steps.version.outputs.VERSIONCODE }}
     steps:
@@ -32,9 +37,14 @@ jobs:
       - name: Generate Version Code
         id: version
         uses: ./.github/actions/generate-version-code
+        with:
+          official: false
+          os: android
+          FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
 
       - name: Build Android
         uses: ./.github/actions/build-android
+        timeout-minutes: 40
         with:
           type: 'experimental'
           BUGSNAG_KEY: ${{ secrets.BUGSNAG_KEY }}
@@ -49,15 +59,16 @@ jobs:
     name: Upload Hold
     runs-on: ubuntu-latest
     needs: [build-android]
+    if: ${{ inputs.trigger == 'pr' }}
     environment: upload_experimental_android
     steps:
       - run: echo "Waiting for manual approval..."
 
   upload-android:
     name: Upload
     runs-on: ubuntu-latest
-    needs: [upload-hold]
-    if: ${{ inputs.type == 'experimental' }}
+    needs: [upload-hold, build-android]
+    if: ${{ inputs.type == 'experimental' && (always() && (needs.upload-hold.result == 'success' || needs.upload-hold.result == 'skipped') && needs.build-android.result == 'success') }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -69,6 +80,7 @@ jobs:
         uses: ./.github/actions/upload-android
         with:
           type: experimental
+          trigger: ${{ inputs.trigger }}
           FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSIONCODE: ${{ needs.build-android.outputs.VERSIONCODE }}
@@ -77,7 +89,7 @@ jobs:
     name: Internal Sharing
     runs-on: ubuntu-latest
     needs: [build-android]
-    if: ${{ inputs.type == 'experimental' }}
+    if: ${{ inputs.type == 'experimental' && inputs.trigger == 'pr' }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -91,4 +103,4 @@ jobs:
           type: experimental
           FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSIONCODE: ${{ needs.build-android.outputs.VERSIONCODE }}
+          VERSIONCODE: ${{ needs.build-android.outputs.VERSIONCODE }}

.github/workflows/build-develop.yml

@@ -0,0 +1,55 @@
+name: Build Develop
+
+permissions:
+  contents: read
+
+on:
+  push:
+    branches:
+      - 'develop'
+
+jobs:
+  run-eslint-and-test:
+    name: ESLint and Test
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/eslint.yml
+
+  android-build-experimental-store:
+    name: Build Android Experimental
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/build-android.yml
+    needs: [run-eslint-and-test]
+    secrets: inherit
+    with:
+      type: experimental
+      trigger: develop
+
+  android-build-official-store:
+    name: Build Android Official
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/build-official-android.yml
+    needs: [run-eslint-and-test]
+    secrets: inherit
+    with:
+      type: official
+      trigger: develop
+
+  ios-build-experimental-store:
+    name: Build iOS Experimental
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/build-ios.yml
+    needs: [run-eslint-and-test]
+    secrets: inherit
+    with:
+      type: experimental
+      trigger: develop
+
+  ios-build-official-store:
+    name: Build iOS Official
+    if: ${{ github.repository == 'RocketChat/Rocket.Chat.ReactNative' }}
+    uses: ./.github/workflows/build-official-ios.yml
+    needs: [run-eslint-and-test]
+    secrets: inherit
+    with:
+      type: official
+      trigger: develop