|
44 | 44 | type: string
|
45 | 45 |
|
46 | 46 | jobs:
|
47 |
| - # version: |
48 |
| - # name: Calculate Version Name and Number |
49 |
| - # uses: bitwarden/ios/.github/workflows/_version.yml@monorepo/new-build #TODO: change to main |
50 |
| - # with: |
51 |
| - # base_version_number: 2000 |
52 |
| - # version_name: ${{ inputs.version-name }} |
53 |
| - # version_number: ${{ inputs.version-number }} |
54 |
| - # patch_version: ${{ inputs.patch_version }} |
55 |
| - # secrets: inherit |
| 47 | + version: |
| 48 | + name: Calculate Version Name and Number |
| 49 | + uses: bitwarden/ios/.github/workflows/_version.yml@monorepo/new-build #TODO: change to main |
| 50 | + with: |
| 51 | + base_version_number: 2000 |
| 52 | + version_name: ${{ inputs.version-name }} |
| 53 | + version_number: ${{ inputs.version-number }} |
| 54 | + patch_version: ${{ inputs.patch_version }} |
| 55 | + secrets: inherit |
56 | 56 |
|
57 | 57 | build-manual:
|
58 | 58 | name: Build Manual - ${{ inputs.build-variant }} (${{ inputs.build-mode }})
|
59 |
| - #needs: version |
| 59 | + needs: version |
60 | 60 | if: ${{ github.event_name == 'workflow_dispatch' }}
|
61 | 61 | uses: bitwarden/ios/.github/workflows/_build-any.yml@monorepo/new-build #TODO: change to main
|
62 | 62 | with:
|
63 | 63 | bw-env: ${{ (inputs.build-variant == 'Production') && 'bwpm_prod' || 'bwpm_beta' }}
|
| 64 | + build-mode: ${{ inputs.build-mode }} |
64 | 65 | version-name: ${{ needs.version.outputs.version_name || '2025.3.0' }}
|
65 | 66 | version-number: ${{ needs.version.outputs.version_number || github.run_number }} #TODO: refactor all inputs to be consistent with - or _
|
| 67 | + compiler-flags: ${{ inputs.compiler-flags }} |
66 | 68 | distribute: ${{ inputs.distribute }}
|
67 | 69 | secrets: inherit
|
68 | 70 |
|
69 | 71 | build-public:
|
70 | 72 | name: Build CI
|
71 |
| - #needs: version |
72 |
| - if: ${{ github.event_name == 'push' }} |
| 73 | + needs: version |
| 74 | + # if: ${{ github.event_name == 'push' }} |
73 | 75 | uses: bitwarden/ios/.github/workflows/_build-any.yml@monorepo/new-build #TODO: change to main
|
74 | 76 | strategy:
|
75 | 77 | matrix:
|
76 |
| - bw-env: [bwpm_prod, bwpm_beta] |
| 78 | + include: |
| 79 | + - bw-env: bwpm_prod |
| 80 | + build-mode: Device |
| 81 | + - bw-env: bwpm_prod |
| 82 | + build-mode: Simulator |
| 83 | + - bw-env: bwpm_beta |
| 84 | + build-mode: Device |
| 85 | + compiler-flags: DEBUG_MENU |
77 | 86 | with:
|
78 | 87 | bw-env: ${{ matrix.bw-env }}
|
| 88 | + build-mode: ${{ matrix.build-mode }} |
79 | 89 | version-name: ${{ needs.version.outputs.version_name }}
|
80 | 90 | version-number: ${{ needs.version.outputs.version_number }}
|
81 |
| - distribute: ${{ inputs.distribute }} |
| 91 | + compiler-flags: ${{ matrix.compiler-flags }} |
82 | 92 | secrets: inherit
|
0 commit comments