Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

undo emulator change

This commit is contained in:
Matthieu 2022-07-26 18:40:41 +02:00
parent a1fe894212
commit d1a34abf85
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -39,15 +39,21 @@ debugTests:
.connected-template: &connected-template .connected-template: &connected-template
stage: test stage: test
image: cimg/android:2022.06
script: script:
- start-emulator
- wait-for-emulator
- adb devices
- adb shell input keyevent 82 &
# Switch to right java version for building the app # 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: artifacts:
paths: paths:
- logcat.txt - logcat.txt
connected 24 default x86_64: connected 23 default x86_64:
<<: *connected-template <<: *connected-template
fdroid build: fdroid build:

2
app/build.gradle
View File

@ -94,7 +94,7 @@ android {
// Use only API levels 27 and higher. // Use only API levels 27 and higher.
apiLevel = 30 apiLevel = 30
// To include Google services, use "google". // To include Google services, use "google".
systemImageSource = "aosp" systemImageSource = "aosp-atd"
// Whether the image must be a 64 bit image. Defaults to false, // Whether the image must be a 64 bit image. Defaults to false,
// in which case the managed device will use a 32 bit image. // in which case the managed device will use a 32 bit image.
// Not applicable to arm64 machines. // Not applicable to arm64 machines.