From df11c6e2f48be3903f546fb32cd9822e7f161385 Mon Sep 17 00:00:00 2001 From: vanous Date: Sun, 8 Oct 2023 21:46:31 +0200 Subject: [PATCH] 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 --- .woodpecker/can_master_build.yml | 2 +- .woodpecker/nightly.yml | 14 +++++++------- .woodpecker/run_lint.yml | 2 +- .woodpecker/run_tests.yml | 2 +- gradle.properties | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.woodpecker/can_master_build.yml b/.woodpecker/can_master_build.yml index dd6f5a72f..dde54fb5c 100644 --- a/.woodpecker/can_master_build.yml +++ b/.woodpecker/can_master_build.yml @@ -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 diff --git a/.woodpecker/nightly.yml b/.woodpecker/nightly.yml index dcbb7b70f..b245e61fc 100644 --- a/.woodpecker/nightly.yml +++ b/.woodpecker/nightly.yml @@ -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 diff --git a/.woodpecker/run_lint.yml b/.woodpecker/run_lint.yml index 96929c391..f78bb032c 100644 --- a/.woodpecker/run_lint.yml +++ b/.woodpecker/run_lint.yml @@ -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 diff --git a/.woodpecker/run_tests.yml b/.woodpecker/run_tests.yml index 2e2a87fd8..2c5a16fdc 100644 --- a/.woodpecker/run_tests.yml +++ b/.woodpecker/run_tests.yml @@ -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 diff --git a/gradle.properties b/gradle.properties index 6b35410f5..872fcadff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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