Skip to content

[PM-12580] Adds CI for the internal Beta build #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 58 commits into from
Oct 3, 2024
Merged
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d57f23d
Adds a version calculation workflow
vvolkgang Sep 10, 2024
0eebb3f
New workflow to dispatch, wait and download artifacts from another woโ€ฆ
vvolkgang Sep 10, 2024
c6c2288
PR feedback: Removes unnecessary newline and capitalises step name
vvolkgang Sep 11, 2024
b2eee33
Merge branch 'main' into new-version-calc-2
vvolkgang Sep 17, 2024
8969895
Merge branch 'main' into new-version-calc-2
vvolkgang Sep 17, 2024
c6cc731
Aligned workflow input descriptions
vvolkgang Sep 24, 2024
578dd8e
Merge branch 'main' into new-version-calc-2
vvolkgang Sep 24, 2024
3ac6e45
Add version number override
vvolkgang Sep 24, 2024
d9fabb5
Add patch version override
vvolkgang Sep 24, 2024
cea06bb
Merge branch 'main' into new-version-calc-2
vvolkgang Sep 24, 2024
72b302d
Use version-name in build.yml
vvolkgang Sep 24, 2024
c00992d
Output inputs
vvolkgang Sep 24, 2024
31620ef
Transitions CI-main to the new version-name
vvolkgang Sep 24, 2024
08b996e
Create the version-info.json file if the version calculation step wasโ€ฆ
vvolkgang Sep 24, 2024
f93c2b6
Merge branch 'use-version-name' into ci-version-name
vvolkgang Sep 24, 2024
3a13fe7
Updated comment
vvolkgang Sep 24, 2024
e5f6406
Remove the need to checkout the repo
vvolkgang Sep 24, 2024
a4a3a0e
Merge branch 'main' into new-version-calc-2
vvolkgang Sep 24, 2024
f8da9db
Merge branch 'new-version-calc-2' into use-version-name
vvolkgang Sep 24, 2024
ea4191d
Merge branch 'use-version-name' into ci-version-name
vvolkgang Sep 24, 2024
d94ea1f
Merge branch 'main' into use-version-name
vvolkgang Oct 1, 2024
1e18762
Dispatch action is in the wrong path, workaround it for now
vvolkgang Oct 1, 2024
ba3622e
Revert "Dispatch action is in the wrong path, workaround it for now"
vvolkgang Oct 1, 2024
d3e79bb
Merge branch 'main' into use-version-name
vvolkgang Oct 1, 2024
ccb4b8c
temp: using branch dispatch instead of main
vvolkgang Oct 1, 2024
dd8513b
Add shell to dispatch
vvolkgang Oct 1, 2024
073411c
Update workflow inputs default values
vvolkgang Oct 1, 2024
5eea7a1
Fix patch input name
vvolkgang Oct 1, 2024
f18cd1a
Add debug logs
vvolkgang Oct 1, 2024
55ebfef
Improve Inputs GitHub summary
vvolkgang Oct 1, 2024
ef4ba26
Fix patch version input
vvolkgang Oct 1, 2024
ca07309
Directory needs to be created first
vvolkgang Oct 1, 2024
bf760bc
use branch version
vvolkgang Oct 1, 2024
7198cca
Change Version Number type to string
vvolkgang Oct 1, 2024
9e80635
Waiting for workflow to finish
vvolkgang Oct 1, 2024
05bb447
fix patch version
vvolkgang Oct 1, 2024
0988a2b
Removing step skip for now
vvolkgang Oct 1, 2024
cbd5b80
Updated other steps to use the new version info
vvolkgang Oct 1, 2024
219de30
Reverted testing changes and improved comments
vvolkgang Oct 2, 2024
9aebadb
Merge branch 'main' into use-version-name
vvolkgang Oct 2, 2024
dcb9afa
Merge branch 'use-version-name' into ci-version-name
vvolkgang Oct 2, 2024
504caee
Merge branch 'main' into ci-version-name
vvolkgang Oct 2, 2024
1f5be84
Fix inputs
vvolkgang Oct 2, 2024
abba86e
Fix Read version info
vvolkgang Oct 2, 2024
1fa0328
Testing input checks
vvolkgang Oct 2, 2024
f94de31
Fix job output
vvolkgang Oct 2, 2024
cee6f4a
fix ""
vvolkgang Oct 2, 2024
c178d2f
fix environment var use
vvolkgang Oct 2, 2024
a48819d
Add tests
vvolkgang Oct 2, 2024
900a769
Fixed step check
vvolkgang Oct 2, 2024
808b6b8
Add the ability to skip distributing builds
vvolkgang Oct 2, 2024
b67c219
Adds Upload Version Info input to build and fixes input related issues
vvolkgang Oct 2, 2024
6f8e1a9
Merge branch 'main' into ci-version-name
vvolkgang Oct 3, 2024
9421d0c
Adds CI for the Internal Beta build with the Debug Menu available
vvolkgang Sep 24, 2024
e87873d
Update inputs and env var name
vvolkgang Oct 3, 2024
5d7f7f1
Merge branch 'main' into automate-internal
vvolkgang Oct 3, 2024
4ce5663
Removed beta reference
vvolkgang Oct 3, 2024
629d605
Bumped base version
vvolkgang Oct 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions .github/workflows/CI-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ on:
env:
XCODE_VERSION: '15.4'
DISTRIBUTE_TO_TESTFLIGHT: ${{ github.event_name == 'push' || inputs.distribute }}
INTERNAL_BETA_PATCH_NUMBER: 999

jobs:
resolve-values:
name: "Resolve values"
Expand Down Expand Up @@ -49,7 +51,7 @@ jobs:
repo: ios
owner: bitwarden
workflow: _version.yml
workflow_inputs: '{"base_version_number": "1000", "version_name": "${{ inputs.build-version }}", "version_number": "${{ inputs.build-number }}", "patch_version": "${{ inputs.patch_version }}"}'
workflow_inputs: '{"base_version_number": "1500", "version_name": "${{ inputs.build-version }}", "version_number": "${{ inputs.build-number }}", "patch_version": "${{ inputs.patch_version }}"}'

- name: Read version info
id: version_info
Expand Down Expand Up @@ -78,8 +80,8 @@ jobs:
name: version-info
path: version-info/version_info.json

build:
name: Build
build-public:
name: Build Public Apps
needs: resolve-values
uses: bitwarden/ios/.github/workflows/build.yml@main
strategy:
Expand All @@ -93,3 +95,27 @@ jobs:
distribute: ${{ fromJSON(needs.resolve-values.outputs.distribute_to_testflight) }}
upload_version_info: false
secrets: inherit

build-internal:
name: Build Internal App
runs-on: macos-14
needs: resolve-values
steps:
- name: Set patch version for internal builds
id: fix-patch-version
run: |
version_name=${{ needs.resolve-values.outputs.build_version }}
internal_version_name="${version_name%.*}.${{ env.INTERNAL_BETA_PATCH_NUMBER }}"
echo "version_name=$internal_version_name" >> $GITHUB_OUTPUT
echo "::warning::Internal version name: $internal_version_name"
- name: Build
uses: bitwarden/ios/.github/workflows/build.yml@main
with:
build-variant: Beta
build-version: ${{ steps.fix-patch-version.outputs.version_name }}
build-number: ${{ needs.resolve-values.outputs.version_number }}
xcode-version: ${{ needs.resolve-values.outputs.xcode_version }}
distribute: ${{ fromJSON(needs.resolve-values.outputs.distribute_to_testflight) }}
upload_version_info: false
compiler-flags: "DEBUG_MENU"
secrets: inherit
Loading