Skip to content

[PM-27522] Test workflows use simulator ID for xcodebuild destinations and remove test retry flags #2075

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.

Sign up for GitHub

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 10 commits into from
Nov 3, 2025
Merged

[PM-27522] Test workflows use simulator ID for xcodebuild destinations and remove test retry flags #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f5561c5
Output booted simulator ID and use it in Test step
vvolkgang Oct 27, 2025
a329c2f
Remove simulator destionation from Build step
vvolkgang Oct 27, 2025
f721669
Revert "Remove simulator destionation from Build step"
vvolkgang Oct 27, 2025
18a67e0
Use simulator ID in build step
vvolkgang Oct 27, 2025
a7ebfe5
Merge branch 'main' into vvolkgang/fix-ios-simulators-boot
vvolkgang Oct 29, 2025
5772816
Set Test Iterations 1
vvolkgang Oct 29, 2025
302c2b3
Remove retry tests on failure and test repetition relaunch.
vvolkgang Oct 30, 2025
de13721
Merge branch 'main' into vvolkgang/fix-ios-simulators-boot
vvolkgang Oct 30, 2025
87cc5e6
Update description
vvolkgang Oct 30, 2025
88dd8e7
Add quotes missed in previous PRs.
vvolkgang Oct 30, 2025
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
7 changes: 7 additions & 0 deletions .github/actions/boot-simulator/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@ inputs:
description: 'iOS version for the simulator (e.g., 26.0)'
required: true

outputs:
simulator-id:
description: 'The identifier of the booted simulator device'
value: ${{ steps.boot.outputs.device-id }}

runs:
using: 'composite'
steps:
- name: Boot Simulator
id: boot
shell: bash
env:
_SIMULATOR_NAME: ${{ inputs.simulator-name }}
Expand All @@ -29,6 +35,7 @@ runs:
xcrun simctl runtime dyld_shared_cache update --all
echo "--------------------------------"
echo "👀 Booting simulator: $_SIMULATOR_NAME ($_SIMULATOR_VERSION) with ID: $DEVICE_ID"
echo "device-id=$DEVICE_ID" >> "$GITHUB_OUTPUT"

i=1
max=5
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/test-bwa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,38 +128,41 @@ jobs:
./Scripts/bootstrap.sh

- name: Boot Simulator
id: boot-simulator
uses: ./.github/actions/boot-simulator
with:
simulator-name: ${{ env._SIMULATOR_NAME }}
simulator-version: ${{ env._SIMULATOR_VERSION }}

- name: Build
env:
_SIMULATOR_ID: ${{ steps.boot-simulator.outputs.simulator-id }}
run: |
python Scripts/pyeetd/main.py & PYEETD_PID=$!
xcrun xcodebuild build-for-testing \
-workspace Bitwarden.xcworkspace \
-scheme Authenticator \
-configuration Debug \
-destination "platform=iOS Simulator,name=$_SIMULATOR_NAME,OS=$_SIMULATOR_VERSION" \
-destination "platform=iOS Simulator,id=$_SIMULATOR_ID" \
-derivedDataPath build/DerivedData \
-resultBundlePath "$_BUILD_RESULT_BUNDLE_PATH" \
-quiet
kill "$PYEETD_PID"

- name: Test
env:
_SIMULATOR_ID: ${{ steps.boot-simulator.outputs.simulator-id }}
run: |
python Scripts/pyeetd/main.py & PYEETD_PID=$!
xcrun xcodebuild test-without-building \
-workspace Bitwarden.xcworkspace \
-scheme Authenticator \
-configuration Debug \
-destination "platform=iOS Simulator,name=$_SIMULATOR_NAME,OS=$_SIMULATOR_VERSION" \
-destination "platform=iOS Simulator,id=$_SIMULATOR_ID" \
-resultBundlePath "$_TESTS_RESULT_BUNDLE_PATH" \
-derivedDataPath build/DerivedData \
-test-timeouts-enabled yes \
-maximum-test-execution-time-allowance 1 \
-retry-tests-on-failure \
-test-repetition-relaunch-enabled YES \
-quiet
kill "$PYEETD_PID"

Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,40 +123,43 @@ jobs:
./Scripts/bootstrap.sh

- name: Boot Simulator
id: boot-simulator
uses: ./.github/actions/boot-simulator
with:
simulator-name: ${{ env._SIMULATOR_NAME }}
simulator-version: ${{ env._SIMULATOR_VERSION }}

- name: Build
env:
_SIMULATOR_ID: ${{ steps.boot-simulator.outputs.simulator-id }}
run: |
python Scripts/pyeetd/main.py & PYEETD_PID=$!
xcrun xcodebuild build-for-testing \
-workspace Bitwarden.xcworkspace \
-scheme Bitwarden \
-configuration Debug \
-destination "platform=iOS Simulator,name=$_SIMULATOR_NAME,OS=$_SIMULATOR_VERSION" \
-destination "platform=iOS Simulator,id=$_SIMULATOR_ID" \
-derivedDataPath build/DerivedData \
-resultBundlePath "$_BUILD_RESULT_BUNDLE_PATH" \
-quiet
kill "$PYEETD_PID"

- name: Test
env:
_SIMULATOR_ID: ${{ steps.boot-simulator.outputs.simulator-id }}
run: |
python Scripts/pyeetd/main.py & PYEETD_PID=$!
xcrun xcodebuild test-without-building \
-workspace Bitwarden.xcworkspace \
-scheme Bitwarden \
-configuration Debug \
-destination "platform=iOS Simulator,name=$_SIMULATOR_NAME,OS=$_SIMULATOR_VERSION" \
-resultBundlePath $_TESTS_RESULT_BUNDLE_PATH \
-destination "platform=iOS Simulator,id=$_SIMULATOR_ID" \
-resultBundlePath "$_TESTS_RESULT_BUNDLE_PATH" \
-derivedDataPath build/DerivedData \
-test-timeouts-enabled yes \
-maximum-test-execution-time-allowance 1 \
-retry-tests-on-failure \
-test-repetition-relaunch-enabled YES \
-quiet
kill $PYEETD_PID
kill "$PYEETD_PID"

- name: Print Logs Summary
if: always()
Expand Down