From 046cb93e35bca695960a37cba42844fb74eb941c Mon Sep 17 00:00:00 2001 From: Nico Alt <nicoalt@posteo.org> Date: Fri, 10 Dec 2021 11:00:03 -0600 Subject: [PATCH] Build only parts on JDK 17 Kudos to @sebkur --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7e5a7b5da..8e9aa29519 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,8 @@ ktlint: build_jar: stage: build script: - - ./gradlew --no-daemon packageUberJarForCurrentOS + - ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 --no-daemon kaptKotlin + - ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 --no-daemon -x kaptKotlin packageUberJarForCurrentOS - mv build/compose/jars/Briar-*.jar ./briar-desktop.jar artifacts: paths: @@ -50,7 +51,8 @@ build_jar: build_deb: stage: build script: - - ./gradlew --no-daemon packageDeb + - ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 --no-daemon kaptKotlin + - ./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 --no-daemon -x kaptKotlin packageDeb - mv build/compose/binaries/main/deb/*.deb ./briar-desktop.deb artifacts: paths: -- GitLab