From d1a34abf8595dfe47bf9fcaa4cffdb1805d52f0e Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Tue, 26 Jul 2022 18:40:41 +0200 Subject: [PATCH] undo emulator change --- .gitlab-ci.yml | 12 +++++++++--- app/build.gradle | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bda512ea..f6aa665a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,15 +39,21 @@ debugTests: .connected-template: &connected-template stage: test - image: cimg/android:2022.06 script: + - start-emulator + - wait-for-emulator + - adb devices + - adb shell input keyevent 82 & # Switch to right java version for building the app - - ./gradlew pixel2api30stagingAndroidTest -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" + - apt-get update || apt-get update + - apt-get install -y openjdk-11-jdk-headless + - update-alternatives --auto java + - ./gradlew connectedStagingAndroidTest || (adb -e logcat -d > logcat.txt; exit 1) artifacts: paths: - logcat.txt -connected 24 default x86_64: +connected 23 default x86_64: <<: *connected-template fdroid build: diff --git a/app/build.gradle b/app/build.gradle index f88b8b03..603ab365 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,7 +94,7 @@ android { // Use only API levels 27 and higher. apiLevel = 30 // To include Google services, use "google". - systemImageSource = "aosp" + systemImageSource = "aosp-atd" // Whether the image must be a 64 bit image. Defaults to false, // in which case the managed device will use a 32 bit image. // Not applicable to arm64 machines.