Update CI to use jdk17 and build tools 33.0.2:

- Using image tag 33.0.0
    - Using jdk 17
    - Removed old memory 512 gradle config
This commit is contained in:
vanous 2023-10-08 21:46:31 +02:00
parent dbb47351dd
commit df11c6e2f4
5 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
steps:
build:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- pwd #bump
- ./gradlew assembleDebug --stacktrace

View File

@ -6,7 +6,7 @@ clone:
steps:
check-if-released:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands: |
RELEASED_VERSION_CODE=$(curl https://freeyourgadget.codeberg.page/fdroid/repo/index-v1.json | jq '.packages."nodomain.freeyourgadget.gadgetbridge.nightly"[0].versionCode')
CURRENT_VERSION_CODE=$(git rev-list HEAD --count)
@ -21,7 +21,7 @@ steps:
build-apks:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- if [ -f .do_not_build ]; then return 0; fi
# build the apks
@ -32,7 +32,7 @@ steps:
secrets: [ signing_key, keystorepass, keypass ]
pull-repo-config:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- if [ -f .do_not_build ]; then return 0; fi
- cd ..
@ -45,7 +45,7 @@ steps:
secrets: [ commit_token ]
pull-pages:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- if [ -f .do_not_build ]; then return 0; fi
# prepare the pages repo, so fdroidclient can push files into it later
@ -64,7 +64,7 @@ steps:
#- rm -f fdroid/repo/*apk
update-fdroid-data:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- if [ -f .do_not_build ]; then return 0; fi
- pwd
@ -84,7 +84,7 @@ steps:
secrets: [ signing_key, keystorepass, keypass ]
push-pages-update-repo:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- if [ -f .do_not_build ]; then return 0; fi
- cd ../pages/pages/
@ -105,7 +105,7 @@ steps:
secrets: [ commit_token ]
on-error:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- cd ..
- mkdir -p repoconfig

View File

@ -1,6 +1,6 @@
steps:
lint:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- pwd #bump
- ./gradlew lint

View File

@ -1,6 +1,6 @@
steps:
tests:
image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
image: codeberg.org/freeyourgadget/android-fdroid-tools:33.0.0
commands:
- pwd #bump
- ./gradlew :app:testBangleDebugUnitTest :app:testMainDebugUnitTest

View File

@ -11,7 +11,7 @@
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit