chore: improved build version logic with repo variable (#6571)

Author: Rohit3523

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

@@ -4,8 +4,8 @@ inputs:
   type:
     description: 'Build type: official or experimental'
     required: true
-  VERSIONCODE:
-    description: 'Version code for build'
+  BUILD_VERSION:
+    description: 'Build version for build'
     required: true
   BUGSNAG_KEY:
     description: 'Bugsnag API key for build'
@@ -90,7 +90,7 @@ runs:
         echo -e "reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64" >> ./gradle.properties
         echo -e "newArchEnabled=true" >> ./gradle.properties
         echo -e "hermesEnabled=true" >> ./gradle.properties
-        echo -e "VERSIONCODE=${{ inputs.VERSIONCODE }}" >> ./gradle.properties
+        echo -e "VERSIONCODE=${{ inputs.BUILD_VERSION }}" >> ./gradle.properties
 
         if [[ "${{ inputs.type }}" == "experimental" ]]; then
           echo -e "APPLICATION_ID=chat.rocket.reactnative" >> ./gradle.properties

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

@@ -4,8 +4,8 @@ inputs:
   type:
     description: 'Build type: official or experimental'
     required: true
-  VERSIONCODE:
-    description: 'Version Code'
+  BUILD_VERSION:
+    description: 'Build version'
     required: true
   APP_STORE_CONNECT_API_KEY_BASE64:
     description: 'Base64 encoded App Store Connect API Key'
@@ -84,7 +84,7 @@ runs:
     - name: Configure Info.plist and build version
       working-directory: ios
       run: |
-        agvtool new-version -all ${{ inputs.VERSIONCODE }}
+        agvtool new-version -all ${{ inputs.BUILD_VERSION }}
         if [[ ${{ inputs.type }} == "official" ]]; then
           /usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ inputs.BUGSNAG_KEY_OFFICIAL }}" ./RocketChatRN/Info.plist
           /usr/libexec/PlistBuddy -c "Set :bugsnag:apiKey ${{ inputs.BUGSNAG_KEY_OFFICIAL }}" ./ShareRocketChatRN/Info.plist

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

@@ -0,0 +1,51 @@
+name: Generate Build Version
+
+inputs:
+  RN_VARIABLES_PAT:
+    required: true
+    type: string
+
+outputs:
+  BUILD_VERSION:
+    description: "Generated build version"
+    value: ${{ steps.compute.outputs.BUILD_VERSION }}
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get BUILD_VERSION from repo variable
+      id: build_version
+      shell: bash
+      run: |
+        RESPONSE=$(
+          curl -s -L \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ inputs.RN_VARIABLES_PAT }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/${{ github.repository }}/actions/variables/BUILD_VERSION
+        )
+
+        VALUE=$(echo "$RESPONSE" | jq -r '.value')
+        echo "LATEST_BUILD_VERSION=$VALUE" >> $GITHUB_OUTPUT
+
+    - name: Compute BUILD_VERSION
+      id: compute
+      shell: bash
+      run: |
+        LATEST_BUILD_VERSION="${{ steps.build_version.outputs.LATEST_BUILD_VERSION }}"
+        BUILD_VERSION=$((LATEST_BUILD_VERSION + 1))
+        echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_OUTPUT
+
+        echo "### 📦 Build Version Generated" >> $GITHUB_STEP_SUMMARY
+        echo "\`Build Version: $BUILD_VERSION\`" >> $GITHUB_STEP_SUMMARY
+
+    - name: Update BUILD_VERSION in repo variable
+      shell: bash
+      run: |
+        curl -s -L \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ inputs.RN_VARIABLES_PAT }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          -X PATCH \
+          -d '{"name": "BUILD_VERSION", "value": "${{ steps.compute.outputs.BUILD_VERSION }}"}' \
+          https://api.github.com/repos/${{ github.repository }}/actions/variables/BUILD_VERSION

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

@@ -10,8 +10,8 @@ inputs:
   GITHUB_TOKEN:
     description: 'GitHub token for commenting'
     required: true
-  VERSIONCODE:
-    description: 'Version code for build'
+  BUILD_VERSION:
+    description: 'Build version for build'
     required: true
   trigger:
     description: 'Trigger for build'
@@ -74,7 +74,7 @@ runs:
         GH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
         PR_NUMBER: ${{ github.event.pull_request.number }}
         BUILD_TYPE: ${{ inputs.type }}
-        VERSION_CODE: ${{ inputs.VERSIONCODE }}
+        BUILD_VERSION: ${{ inputs.BUILD_VERSION }}
       run: |
         if [[ "$BUILD_TYPE" == "official" ]]; then
           app_name="Rocket.Chat"
@@ -85,7 +85,7 @@ runs:
         gradle_file="android/app/build.gradle"
         VERSION_NAME=$(grep versionName $gradle_file | head -n 1 | sed -E 's/.*versionName[[:space:]]+"([^"]+)".*/\1/')
 
-        version_info="$app_name $VERSION_NAME.$VERSION_CODE"
+        version_info="$app_name $VERSION_NAME.$BUILD_VERSION"
 
         message="**Android Build Available**"$'\n\n'"$version_info"
 

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

@@ -10,8 +10,8 @@ inputs:
   GITHUB_TOKEN:
     description: 'GitHub token for commenting'
     required: true
-  VERSIONCODE:
-    description: 'Version code for build'
+  BUILD_VERSION:
+    description: 'Build version for build'
     required: true
   trigger:
     description: 'Trigger for build'
@@ -84,7 +84,7 @@ runs:
         GH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
         PR_NUMBER: ${{ github.event.pull_request.number }}
         BUILD_TYPE: ${{ inputs.type }}
-        VERSION_CODE: ${{ inputs.VERSIONCODE }}
+        BUILD_VERSION: ${{ inputs.BUILD_VERSION }}
       run: |
         if [[ -z "$INTERNAL_SHARING_URL" ]]; then
           echo "No internal sharing URL found in env"
@@ -97,7 +97,7 @@ runs:
           app_name="Rocket.Chat Experimental"
         fi
 
-        version_info="$app_name $VERSION_NAME.$VERSION_CODE"
+        version_info="$app_name $VERSION_NAME.$BUILD_VERSION"
 
         message="**Android Build Available**"$'\n\n'"$version_info"$'\n\n'"Internal App Sharing: $INTERNAL_SHARING_URL"
 

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

@@ -135,10 +135,10 @@ runs:
         plist="ios/RocketChatRN/Info.plist"
 
         version_name=$(/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "$plist")
-        version_code=$(/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" "$plist")
+        build_version=$(/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" "$plist")
 
         echo "VERSION_NAME=$version_name" >> $GITHUB_ENV
-        echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+        echo "BUILD_VERSION=$build_version" >> $GITHUB_ENV
       shell: bash
 
     - name: Comment on PR with TestFlight Info
@@ -154,7 +154,7 @@ runs:
           app_name="Rocket.Chat Experimental"
         fi
 
-        message="**iOS Build Available**"$'\n\n'"$app_name $VERSION_NAME.$VERSION_CODE"
+        message="**iOS Build Available**"$'\n\n'"$app_name $VERSION_NAME.$BUILD_VERSION"
 
         gh pr comment "$PR_NUMBER" --body "$message"
       shell: bash

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

@@ -26,7 +26,7 @@ jobs:
     needs: [build-hold]
     if: ${{ inputs.type == 'experimental' && (always() && (needs.build-hold.result == 'success' || needs.build-hold.result == 'skipped')) }}
     outputs:
-      VERSIONCODE: ${{ steps.version.outputs.VERSIONCODE }}
+      BUILD_VERSION: ${{ steps.version.outputs.BUILD_VERSION }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -39,13 +39,11 @@ jobs:
         with:
           build_name: 'android-experimental'
 
-      - name: Generate Version Code
+      - name: Generate Build Version
         id: version
-        uses: ./.github/actions/generate-version-code
+        uses: ./.github/actions/generate-build-version
         with:
-          official: false
-          os: android
-          FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
+          RN_VARIABLES_PAT: ${{ secrets.RN_VARIABLES_PAT }}
 
       - name: Build Android
         uses: ./.github/actions/build-android
@@ -58,7 +56,7 @@ jobs:
           KEYSTORE_EXPERIMENTAL_PASSWORD: ${{ secrets.KEYSTORE_EXPERIMENTAL_PASSWORD }}
           KEYSTORE_EXPERIMENTAL_ALIAS: ${{ secrets.KEYSTORE_EXPERIMENTAL_ALIAS }}
           GOOGLE_SERVICES_ANDROID: ${{ secrets.GOOGLE_SERVICES_ANDROID }}
-          VERSIONCODE: ${{ steps.version.outputs.VERSIONCODE }}
+          BUILD_VERSION: ${{ steps.version.outputs.BUILD_VERSION }}
 
   upload-hold:
     name: Upload Hold
@@ -67,7 +65,7 @@ jobs:
     if: ${{ inputs.trigger == 'pr' }}
     environment: upload_experimental_android
     outputs:
-      VERSIONCODE: ${{ needs.build-android.outputs.VERSIONCODE }}
+      BUILD_VERSION: ${{ needs.build-android.outputs.BUILD_VERSION }}
     steps:
       - run: echo "Waiting for manual approval..."
 
@@ -90,7 +88,7 @@ jobs:
           trigger: ${{ inputs.trigger }}
           FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSIONCODE: ${{ needs.upload-hold.outputs.VERSIONCODE }}
+          BUILD_VERSION: ${{ needs.upload-hold.outputs.BUILD_VERSION }}
 
   upload-internal:
     name: Internal Sharing
@@ -110,4 +108,4 @@ jobs:
           type: experimental
           FASTLANE_GOOGLE_SERVICE_ACCOUNT: ${{ secrets.FASTLANE_GOOGLE_SERVICE_ACCOUNT }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSIONCODE: ${{ needs.build-android.outputs.VERSIONCODE }}
+          BUILD_VERSION: ${{ needs.build-android.outputs.BUILD_VERSION }}

.github/workflows/build-android.yml

@@ -37,19 +37,11 @@ jobs:
         with:
           build_name: 'ios-experimental'
 
-      - name: Generate Version Code
+      - name: Generate Build Version
         id: version
-        uses: ./.github/actions/generate-version-code
+        uses: ./.github/actions/generate-build-version
         with:
-          official: false
-          os: ios
-          APP_STORE_CONNECT_API_KEY_BASE64: ${{ secrets.APP_STORE_CONNECT_API_KEY_BASE64 }}
-          MATCH_KEYCHAIN_NAME: ${{ secrets.MATCH_KEYCHAIN_NAME }}
-          MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
-          APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
-          FASTLANE_REPO_PAT: ${{ secrets.FASTLANE_REPO_PAT }}
+          RN_VARIABLES_PAT: ${{ secrets.RN_VARIABLES_PAT }}
 
       - name: Build iOS
         uses: ./.github/actions/build-ios
@@ -66,7 +58,7 @@ jobs:
           APP_STORE_CONNECT_API_KEY_BASE64: ${{ secrets.APP_STORE_CONNECT_API_KEY_BASE64 }}
           GOOGLE_SERVICES_IOS: ${{ secrets.GOOGLE_SERVICES_IOS }}
           GOOGLE_SERVICES_IOS_EXPERIMENTAL: ${{ secrets.GOOGLE_SERVICES_IOS_EXPERIMENTAL }}
-          VERSIONCODE: ${{ steps.version.outputs.VERSIONCODE }}
+          BUILD_VERSION: ${{ steps.version.outputs.BUILD_VERSION }}
 
   upload-ios:
     name: Upload