test

Author: vvolkgang

.github/workflows/CI-main.yml

@@ -15,20 +15,21 @@ on:
       patch_version:
         description: "Patch Version Override - e.g. '999'"
         type: string
-      ditribute:
+      distribute:
         description: "Distribute to TestFlight"
         type: boolean
-        default: false
 env:
   XCODE_VERSION: '15.4'
   DISTRIBUTE_TO_TESTFLIGHT: ${{ github.event_name == 'push' || inputs.distribute }}
 jobs:
   resolve-values:
     name: "Resolve values"
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     outputs:
       version_name: ${{ steps.version_info.outputs.version_name }}
       version_number: ${{ steps.version_info.outputs.version_number }}
+      xcode_version: ${{ env.XCODE_VERSION }}
+      distribute_to_testflight: ${{ env.DISTRIBUTE_TO_TESTFLIGHT }}
     steps:
       - name: Log inputs to job summary
         run: |
@@ -80,14 +81,15 @@ jobs:
   build:
     name: Build
     needs: resolve-values
-    uses: bitwarden/ios/.github/workflows/build.yml@main
+    uses: bitwarden/ios/.github/workflows/build.yml@ci-version-name
     strategy:
       matrix:
         variant: [Beta, Production]
     with:
       build-variant: ${{ matrix.variant }}
       build-version: ${{ needs.resolve-values.outputs.version_name }}
       build-number: ${{ needs.resolve-values.outputs.version_number }}
-      xcode-version: $XCODE_VERSION
-      distribute: $DISTRIBUTE_TO_TESTFLIGHT
+      xcode-version: ${{ needs.resolve-values.outputs.xcode_version }}
+      distribute: ${{ fromJSON(needs.resolve-values.outputs.distribute_to_testflight) }}
+      upload_version_info: false
     secrets: inherit

.github/workflows/build.yml

@@ -31,10 +31,10 @@ on:
       patch_version:
         description: "Patch Version Override - e.g. '999'"
         type: string
-      ditribute:
+      distribute:
         description: "Distribute to TestFlight"
         type: boolean
-        default: false
+        default: true
   workflow_call:
     inputs:
       build-variant:
@@ -59,10 +59,12 @@ on:
       patch_version:
         description: "Patch Version Override - e.g. '999'"
         type: string
-      ditribute:
+      distribute:
         description: "Distribute to TestFlight"
         type: boolean
-        default: false
+      upload_version_info:
+        description: "Upload version-info file - When false, caller may be handling it already"
+        type: boolean
 env:
   BUILD_VARIANT: ${{ inputs.build-variant || 'Beta' }}
   XCODE_VERSION: ${{ inputs.xcode-version || '15.4' }}
@@ -125,6 +127,7 @@ jobs:
           echo "version_name=$(echo $content | jq -r .version_name)" >> $GITHUB_OUTPUT
           echo "version_number=$(echo $content | jq -r .version_number)" >> $GITHUB_OUTPUT
       - name: Upload version info artifact
+        if: ${{ inputs.upload_version_info }}
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: version-info
@@ -358,7 +361,7 @@ jobs:
             --apiIssuer "${{ secrets.APP_STORE_CONNECT_TEAM_ISSUER }}"
 
       - name: Upload app to TestFlight with Fastlane
-        if: ${{ inputs.ditribute }}
+        if: ${{ inputs.distribute }}
         run: |
           CHANGELOG="$(git show -s --format=%s)
           $GITHUB_REPOSITORY/$GITHUB_REF_NAME @ $GITHUB_SHA