Skip to content

Commit e93b606

Browse files
Fix android build flag boolean evaluation (#221)
* Fix android build flag boolean evaluation * start adb server before waiting for device
1 parent a175884 commit e93b606

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

.github/workflows/scripts/android/android-emulator-tests.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ log "Starting Android emulator"
9696
nohup emulator -no-metrics -partition-size 1024 -memory 4096 -wipe-data -no-window -no-snapshot -noaudio -no-boot-anim -avd "${ANDROID_EMULATOR_NAME}" &
9797

9898
log "Waiting for Android emulator startup"
99+
adb start-server
100+
sleep 5
99101
timeout "${ANDROID_EMULATOR_TIMEOUT}" adb wait-for-any-device
100102

101103
log "Prepare Swift test package"

.github/workflows/swift_package_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ jobs:
648648
run: ${{ inputs.linux_pre_build_command }}
649649
- name: Install Swift SDK for Android and build
650650
env:
651-
BUILD_FLAGS: ${{ inputs.enable_android_sdk_checks && '--build-tests' }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
651+
BUILD_FLAGS: ${{ inputs.enable_android_sdk_checks && '--build-tests' || '' }} ${{ (contains(matrix.swift_version, 'nightly') && inputs.swift_nightly_flags) || inputs.swift_flags }}
652652
shell: bash
653653
run: |
654654
${{ inputs.android_sdk_pre_build_command }}

0 commit comments

Comments
 (0)