Skip to content

Add -ea workflow (both JDK-ea and JavaFX-ea) #13056

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
May 5, 2025
Merged

Add -ea workflow (both JDK-ea and JavaFX-ea) #13056

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
ce28e61
Prepare gradle build for JDK25
koppor May 4, 2025
336179b
Initial -ea workflow
koppor May 4, 2025
05a3d26
Port deployment-ea.yml from v6.0-alpha2
koppor May 4, 2025
ed1bb9e
Fix sed usage
koppor May 4, 2025
ea937db
Fix set -x on Windows
koppor May 4, 2025
0ee032d
Fix trigger
koppor May 4, 2025
808f000
Try to get workflows running
koppor May 4, 2025
51d0b4d
Try to fix if
koppor May 4, 2025
50ade1c
Try to fix find on macOS
koppor May 4, 2025
9f2adac
Maybe, on Windows, mise is available on bash?
koppor May 4, 2025
75d4919
Try to fix sed
koppor May 4, 2025
ee1c90f
Just use OpenJDK VM distribution
koppor May 4, 2025
4f8f93c
Debug should not be needed - as gradle runs on JDK21
koppor May 4, 2025
dcda714
Try to fix Azul
koppor May 4, 2025
225e0e7
More debug (and fix path)
koppor May 4, 2025
eb32c61
Fix SDK path also for macOS
koppor May 4, 2025
562e524
Fix path
koppor May 4, 2025
b151134
Fix upload path
koppor May 4, 2025
72bd4a2
Also include changes in build-logic
koppor May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
467 changes: 467 additions & 0 deletions .github/workflows/deployment-ea.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build-logic/src/main/kotlin/buildlogic.java-common-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ testing {
}

java {
sourceCompatibility = JavaVersion.VERSION_24
targetCompatibility = JavaVersion.VERSION_24
toolchain {
// If this is updated, also update
// - build.gradle -> jacoco -> toolVersion (because JaCoCo does not support newest JDK out of the box. Check versions at https://www.jacoco.org/jacoco/trunk/doc/changes.html)
Expand Down
5 changes: 4 additions & 1 deletion jabgui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ dependencies {
testImplementation("org.testfx:testfx-core:4.0.16-alpha")
testImplementation("org.testfx:testfx-junit5:4.0.16-alpha")

testImplementation("org.mockito:mockito-core:5.17.0")
testImplementation("org.mockito:mockito-core:5.17.0") {
exclude(group = "net.bytebuddy", module = "byte-buddy")
}
testImplementation("net.bytebuddy:byte-buddy:1.17.5")

// recommended by https://github.com/wiremock/wiremock/issues/2149#issuecomment-1835775954
testImplementation("org.wiremock:wiremock-standalone:3.12.1")
Expand Down
5 changes: 4 additions & 1 deletion jabkit/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ dependencies {
implementation("org.apache.lucene:lucene-queryparser:${luceneVersion}")

testImplementation(project(":test-support"))
testImplementation("org.mockito:mockito-core:5.17.0")
testImplementation("org.mockito:mockito-core:5.17.0") {
exclude(group = "net.bytebuddy", module = "byte-buddy")
}
testImplementation("net.bytebuddy:byte-buddy:1.17.5")
}

/*
Expand Down
5 changes: 4 additions & 1 deletion jablib/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,10 @@ dependencies {
testImplementation("org.junit.jupiter:junit-jupiter-params:5.12.2")
testImplementation("org.junit.platform:junit-platform-launcher:1.12.2")

testImplementation("org.mockito:mockito-core:5.17.0")
testImplementation("org.mockito:mockito-core:5.17.0") {
exclude(group = "net.bytebuddy", module = "byte-buddy")
}
testImplementation("net.bytebuddy:byte-buddy:1.17.5")

testImplementation("org.xmlunit:xmlunit-core:2.10.0")
testImplementation("org.xmlunit:xmlunit-matchers:2.10.0")
Expand Down
5 changes: 4 additions & 1 deletion jabsrv/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ dependencies {
exclude(group = "org.antlr")
}

testImplementation("org.mockito:mockito-core:5.17.0")
testImplementation("org.mockito:mockito-core:5.17.0") {
exclude(group = "net.bytebuddy", module = "byte-buddy")
}
testImplementation("net.bytebuddy:byte-buddy:1.17.5")
}

javafx {
Expand Down
6 changes: 5 additions & 1 deletion test-support/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ dependencies {
implementation("org.apache.logging.log4j:log4j-to-slf4j:2.24.3")

implementation("org.junit.jupiter:junit-jupiter-api:5.12.2")
implementation("org.mockito:mockito-core:5.17.0")

implementation("org.mockito:mockito-core:5.17.0") {
exclude(group = "net.bytebuddy", module = "byte-buddy")
}
implementation("net.bytebuddy:byte-buddy:1.17.5")

implementation("org.jspecify:jspecify:1.0.0")
}
Expand Down