Skip to content

Commit 83d3f1c

Browse files
Fix test run
1 parent 5ccb9bb commit 83d3f1c

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ RUN curl -L --fail --retry 3 --retry-delay 5 "$LIBWEBP_URL" -O && \
1414
tar -xzf "$LIBWEBP_FILE" --one-top-level=libwebp --strip-components=1 && \
1515
rm "$LIBWEBP_FILE"
1616

17-
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false"
1817
COPY . .
1918
RUN --mount=type=cache,target=/root/.gradle ./gradlew jlink shadowJar
2019

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ def jlink = tasks.register('jlink', JlinkTask) {
6161
test {
6262
dependsOn jlink
6363

64-
def jre = jlink.get().jreDir
64+
def jre = jlink.map { it.jreDir }
6565
inputs.dir jre
66-
executable = jre.get().file(Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin\\java.exe' : 'bin/java')
66+
67+
executable = jre.get().file(Os.isFamily(Os.FAMILY_WINDOWS) ? 'bin\\java.exe' : 'bin/java').get()
6768

6869
useJUnitPlatform()
6970
finalizedBy jacocoTestReport

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,18 @@ public void performAction() {
8585
execSpec.setErrorOutput(stderr);
8686
});
8787

88-
if (result.getExitValue() == 0) {
89-
getLogger().info(stdout.toString());
90-
} else {
91-
getLogger().log(LogLevel.ERROR, stderr.toString());
88+
var stdoutStr = stdout.toString();
89+
var stderrStr = stderr.toString();
90+
91+
if (!stdoutStr.isEmpty()) {
92+
getLogger().info(stdoutStr);
93+
}
94+
95+
if (result.getExitValue() != 0 && !stderrStr.isEmpty()) {
96+
getLogger().log(LogLevel.ERROR, stderrStr);
9297
}
9398

9499
result.assertNormalExitValue();
95-
result.rethrowFailure();
96100
}
97101

98102
}

0 commit comments

Comments
 (0)