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

Test java thingie

This commit is contained in:
Matthieu 2023-01-21 17:35:39 +01:00
parent 4ed9c385d6
commit 9ebf11b8df
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -24,7 +24,7 @@ before_script:
- apt-get update || apt-get update - apt-get update || apt-get update
- apt-get install -y openjdk-17-jdk-headless - apt-get install -y openjdk-17-jdk-headless
- update-alternatives --auto java - update-java-alternatives -s java-1.17.0-openjdk-amd64
after_script: after_script:
# this file changes every time but should not be cached # this file changes every time but should not be cached
- rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock - rm -f $GRADLE_USER_HOME/caches/modules-2/modules-2.lock
@ -77,9 +77,7 @@ debugTests:
image: briar/ci-image-android-emulator:latest image: briar/ci-image-android-emulator:latest
stage: test stage: test
script: script:
- apt-get update || apt-get update - export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
- apt-get install -y openjdk-17-jdk-headless
- update-alternatives --auto java
- ./gradlew assembleStaging - ./gradlew assembleStaging
- export AVD_SDK=`echo $CI_JOB_NAME | awk '{print $2}'` - export AVD_SDK=`echo $CI_JOB_NAME | awk '{print $2}'`
- export AVD_TAG=`echo $CI_JOB_NAME | awk '{print $3}'` - export AVD_TAG=`echo $CI_JOB_NAME | awk '{print $3}'`

2
app/build.gradle
View File

@ -35,7 +35,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33 targetSdkVersion 33
versionCode 21 versionCode 22
versionName "1.0.beta" + versionCode versionName "1.0.beta" + versionCode
//TODO add resConfigs("en", "fr", "ja",...) ? //TODO add resConfigs("en", "fr", "ja",...) ?