diff --git a/.github/workflows/benchmark_suite.yml b/.github/workflows/benchmark_suite.yml index 3a6fde43dac..a4cf4d6b4f8 100644 --- a/.github/workflows/benchmark_suite.yml +++ b/.github/workflows/benchmark_suite.yml @@ -11,11 +11,15 @@ concurrency: cancel-in-progress: true jobs: - # reactivecircus/android-emulator-runner@v2 requires MacOS to run on - # https://github.com/ReactiveCircus/android-emulator-runner benchmark_suite: - runs-on: [ macos-latest ] + runs-on: [ ubuntu-latest ] steps: + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + - name: Checkout Android source uses: actions/checkout@v3 diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml index 8fa00536c1b..0fd8eff1cd5 100644 --- a/.github/workflows/ci_checks.yml +++ b/.github/workflows/ci_checks.yml @@ -48,16 +48,20 @@ jobs: - name: QA Unit Tests run: ./gradlew --build-cache --no-daemon testQaDebugUnitTest - # reactivecircus/android-emulator-runner@v2 requires MacOS to run on - # https://github.com/ReactiveCircus/android-emulator-runner qa_android_tests: - runs-on: [ macos-latest ] + runs-on: [ ubuntu-latest ] timeout-minutes: 60 env: AVD_API_LEVEL: 30 AVD_ARCH: x86_64 HEROKU_API_KEY: ${{ secrets.SERVICES_HEROKU_API_KEY }} steps: + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + - name: Checkout Android source uses: actions/checkout@v3 with: diff --git a/.github/workflows/maestro_tests.yml b/.github/workflows/maestro_tests.yml index 2ade1ef65ea..5f920c4895c 100644 --- a/.github/workflows/maestro_tests.yml +++ b/.github/workflows/maestro_tests.yml @@ -13,8 +13,14 @@ concurrency: jobs: maestro-tests: - runs-on: [ macos-latest ] + runs-on: [ ubuntu-latest ] steps: + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + - name: Checkout Android source uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index f121a87d9fb..901f3da7877 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Bump Room to v2.6.1 - Bump AndroidX ViewModel v2.7.0 - Bump AndroidX Work to v2.9.0 +- Use ubuntu machine for running integration/ui tests on CI ### Fixes