Skip to content

Commit e5bd287

Browse files
committed
another test
1 parent c92dd21 commit e5bd287

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

.github/workflows/build.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
types: [opened, synchronize, reopened]
88

9+
concurrency:
10+
group: ci-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
build:
1115
name: Gradle build on ${{ matrix.os }}
@@ -18,6 +22,7 @@ jobs:
1822
contents: read
1923
env:
2024
GRADLE_OPTS: -Dorg.gradle.daemon=false
25+
JAVA_TOOL_OPTIONS: --enable-native-access=ALL-UNNAMED
2126
defaults:
2227
run:
2328
working-directory: de.peeeq.wurstscript
@@ -26,7 +31,7 @@ jobs:
2631
- name: Checkout
2732
uses: actions/checkout@v4
2833
with:
29-
fetch-depth: 0 # needed for your JGit version/describe
34+
fetch-depth: 0
3035

3136
- name: Setup Temurin JDK 25
3237
uses: actions/setup-java@v4
@@ -40,6 +45,18 @@ jobs:
4045
- name: Setup Gradle cache
4146
uses: gradle/actions/setup-gradle@v4
4247

48+
# Ensure Gradle/toolchain use the setup-java JDK (avoids /usr/lib/jvm noise on Ubuntu)
49+
- name: Pin Gradle toolchain to setup-java JDK
50+
run: |
51+
echo "org.gradle.java.installations.paths=$JAVA_HOME" >> gradle.properties
52+
echo "org.gradle.java.installations.auto-detect=false" >> gradle.properties
53+
54+
- name: Print Java & jlink
55+
run: |
56+
echo "JAVA_HOME=$JAVA_HOME"
57+
"$JAVA_HOME/bin/java" -version
58+
"$JAVA_HOME/bin/jlink" --version
59+
4360
- name: Run tests
4461
run: ./gradlew test --no-daemon --stacktrace
4562

@@ -55,3 +72,5 @@ jobs:
5572
de.peeeq.wurstscript/build/releases/*.zip
5673
de.peeeq.wurstscript/build/releases/*.tar.gz
5774
de.peeeq.wurstscript/build/releases/*.sha256
75+
if-no-files-found: error
76+
retention-days: 7

de.peeeq.wurstscript/deploy.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,12 @@ tasks.register("jlinkRuntime25") {
128128
def result = execOps.exec {
129129
commandLine jlink,
130130
"--verbose",
131-
"--module-path", jmodsDir, // <— force clean jmods
131+
"--module-path", jmodsDir,
132132
"--add-modules", mods,
133133
"--no-header-files",
134134
"--no-man-pages",
135135
"--strip-debug",
136-
"--compress", "zip-6", // replaces deprecated "--compress=2"
136+
"--compress=zip-6",
137137
"--output", outDir.absolutePath
138138
errorOutput = errBuf
139139
standardOutput = outBuf

0 commit comments

Comments
 (0)