test

bitwarden · Oct 2, 2024 · da59e49 · da59e49
1 parent 808b6b8
commit da59e49
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/CI-main.yml b/.github/workflows/CI-main.yml
@@ -15,7 +15,7 @@ on:
       patch_version:
         description: "Patch Version Override - e.g. '999'"
         type: string
-      ditribute:
+      distribute:
         description: "Distribute to TestFlight"
         type: boolean
         default: false
@@ -80,7 +80,7 @@ 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]
@@ -89,5 +89,7 @@ jobs:
       build-version: ${{ needs.resolve-values.outputs.version_name }}
       build-number: ${{ needs.resolve-values.outputs.version_number }}
       xcode-version: $XCODE_VERSION
-      distribute: $DISTRIBUTE_TO_TESTFLIGHT
+      #distribute: $DISTRIBUTE_TO_TESTFLIGHT
+      distribute: ${{ inputs.distribute}}
+      upload_version_info: false
     secrets: inherit
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ on:
       patch_version:
         description: "Patch Version Override - e.g. '999'"
         type: string
-      ditribute:
+      distribute:
         description: "Distribute to TestFlight"
         type: boolean
         default: false
@@ -59,10 +59,14 @@ 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
+        default: false
 env:
   BUILD_VARIANT: ${{ inputs.build-variant || 'Beta' }}
   XCODE_VERSION: ${{ inputs.xcode-version || '15.4' }}
@@ -125,6 +129,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 +363,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