From d04466c46148f5975d0d15dfb3aa59dbb1dff0f9 Mon Sep 17 00:00:00 2001 From: Bixilon Date: Mon, 17 Oct 2022 23:33:39 +0200 Subject: [PATCH] fix ci --- .gitlab-ci.yml | 5 ++--- build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index deba780c3..dec79dc6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,11 +49,10 @@ test: package: stage: package script: - - chmod 660 .gradle/ build/ -R - - ./gradlew fatJar + - ./gradlew fatJar --stacktrace only: - master - - merge_requests + - test/gradle artifacts: paths: - build/libs/minosoft-fat-*.jar diff --git a/build.gradle.kts b/build.gradle.kts index 751df08ee..78a108e86 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -262,7 +262,7 @@ dependencies { implementation("de.bixilon", "jiibles", "1.1.1") implementation("de.bixilon", "kotlin-glm", "0.9.9.1-6") implementation("de.bixilon", "mbf-kotlin", "0.2.1") { exclude("com.github.luben", "zstd-jni") } - implementation("de.bixilon.javafx", "javafx-svg", "0.3") + implementation("de.bixilon.javafx", "javafx-svg", "0.3") { exclude("org.openjfx", "javafx-controls") } // netty netty("buffer")