Skip to content

Commit b2d671d

Browse files
committed
Troubleshoot artifact
1 parent 781848c commit b2d671d

File tree

3 files changed

+35
-22
lines changed

3 files changed

+35
-22
lines changed

.github/workflows/_build-any.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ jobs:
184184
run: |
185185
mkdir -p $_EXPORT_PATH
186186
mkdir -p $_EXPORT_PATH/dSYMs
187+
187188
bundle exec fastlane post_build \
188189
--env $_BW_ENV \
189190
build_mode:$_BUILD_MODE \

.github/workflows/ci-bwpm.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,49 @@ on:
4444
type: string
4545

4646
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
5656

5757
build-manual:
5858
name: Build Manual - ${{ inputs.build-variant }} (${{ inputs.build-mode }})
59-
#needs: version
59+
needs: version
6060
if: ${{ github.event_name == 'workflow_dispatch' }}
6161
uses: bitwarden/ios/.github/workflows/_build-any.yml@monorepo/new-build #TODO: change to main
6262
with:
6363
bw-env: ${{ (inputs.build-variant == 'Production') && 'bwpm_prod' || 'bwpm_beta' }}
64+
build-mode: ${{ inputs.build-mode }}
6465
version-name: ${{ needs.version.outputs.version_name || '2025.3.0' }}
6566
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 }}
6668
distribute: ${{ inputs.distribute }}
6769
secrets: inherit
6870

6971
build-public:
7072
name: Build CI
71-
#needs: version
72-
if: ${{ github.event_name == 'push' }}
73+
needs: version
74+
# if: ${{ github.event_name == 'push' }}
7375
uses: bitwarden/ios/.github/workflows/_build-any.yml@monorepo/new-build #TODO: change to main
7476
strategy:
7577
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
7786
with:
7887
bw-env: ${{ matrix.bw-env }}
88+
build-mode: ${{ matrix.build-mode }}
7989
version-name: ${{ needs.version.outputs.version_name }}
8090
version-number: ${{ needs.version.outputs.version_number }}
81-
distribute: ${{ inputs.distribute }}
91+
compiler-flags: ${{ matrix.compiler-flags }}
8292
secrets: inherit

fastlane/Fastfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -364,14 +364,16 @@ platform :ios do |options|
364364
build_dsyms_path = app_config[:build_dsyms_path]
365365
build_app_path = app_config[:build_app_path]
366366

367-
case build_mode
368-
when 'simulator'
369-
sh("cp -r #{build_app_path} #{export_path}")
370-
when 'device'
371-
sh("cp #{build_ipa_path} #{export_path}")
372-
sh("cp -rv #{build_dsyms_path}/*dSYM #{export_path}/dSYMs")
373-
else
374-
UI.user_error!("Invalid build mode: #{build_mode}")
367+
Dir.chdir("..") do
368+
case build_mode
369+
when 'simulator'
370+
sh("cp -r #{build_app_path} #{export_path}")
371+
when 'device'
372+
sh("cp -v #{build_ipa_path} #{export_path}")
373+
sh("cp -rv #{build_dsyms_path}/*dSYM #{export_path}/dSYMs")
374+
else
375+
UI.user_error!("Invalid build mode: #{build_mode}")
376+
end
375377
end
376378
end
377379

0 commit comments

Comments
 (0)