From 94203d18baf5c63fd50a84bf0dde551f151499b5 Mon Sep 17 00:00:00 2001 From: Carson Radtke Date: Fri, 11 Oct 2024 13:21:26 -0500 Subject: [PATCH] [ci]: fix android job Job has been failing for months and is preventing other PRs from getting merged. This PR fixes the pipeline - it changed the following: - runs on macos-latest-large (which is a non-arm image) - starts the emulator under java8 (see https://learn.microsoft.com/en-us/java/openjdk/transition-from-java-8-to-java-11) - runs emulator with -no-audio The above were requirements to get the pipeline running. Other changes include the following: - The job will auto-cancel when a newer commit is pushed to the PR. - The 'Wait for emulator ready' step now has a 2 minute timeout. This is necessary because we get no indication on whether or not the command that started the emulator suceeded. I believe there is room for improvement here, but it is outside the scope of the PR. --- .github/workflows/android.yml | 23 ++++++++++++++++------- tests/CMakeLists.txt | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 939c461..a2c88fc 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -1,4 +1,9 @@ name: CI_Android + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + on: push: branches: [ main ] @@ -7,7 +12,7 @@ on: jobs: Android: - runs-on: macos-latest + runs-on: macos-latest-large defaults: run: working-directory: build @@ -18,15 +23,19 @@ jobs: run: mkdir -p build working-directory: . - - name: Start emulator + - uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: zulu + + - name: Start Emulator run: | echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-24;default;x86_64' echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n xamarin_android_emulator -k 'system-images;android-24;default;x86_64' --force $ANDROID_HOME/emulator/emulator -list-avds - echo "Starting emulator" - # Start emulator in background - nohup $ANDROID_HOME/emulator/emulator -avd xamarin_android_emulator -no-snapshot > /dev/null 2>&1 & - echo "Emulator starting" + echo "Starting emulator..." + nohup $ANDROID_HOME/emulator/emulator -no-audio -no-snapshot -avd xamarin_android_emulator &> /dev/null & + echo "Emulator starting in background" - name: Configure run: cmake -Werror=dev -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=16 -DANDROID_ABI=x86_64 -DCMAKE_BUILD_TYPE=Debug .. @@ -35,11 +44,11 @@ jobs: run: cmake --build . --parallel - name: Wait for emulator ready + timeout-minutes: 2 run: | $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 10; done; input keyevent 82' $ANDROID_HOME/platform-tools/adb devices $ANDROID_HOME/platform-tools/adb shell getprop ro.product.cpu.abi - echo "Emulator started" - name: Deploy tests run: | diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 519e4a4..9de2519 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -146,6 +146,7 @@ else() -Wno-global-constructors # GTest -Wno-missing-prototypes -Wno-padded + -Wno-switch-default -Wno-unknown-attributes -Wno-used-but-marked-unused # GTest EXPECT_DEATH -Wno-weak-vtables