Skip to content

Fix Gradle 9.3.0 compatibility in debian JDK packaging task #1327

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
steelhead31 merged 2 commits into from
Jan 28, 2026
Merged

Fix Gradle 9.3.0 compatibility in debian JDK packaging task #1327

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8444012
Initial plan
Copilot Jan 26, 2026
48a6d07
Fix indentation in linux/jdk/debian/build.gradle for Gradle 9.3.0 com…
Copilot Jan 26, 2026
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
64 changes: 31 additions & 33 deletions linux/jdk/debian/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,44 +102,42 @@ task packageJdkDebian {
}
}

println "The Value Of ARCH is: $arch"

if ("$arch" == "armhf") {
project.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
println "The Value Of ARCH is: $arch"

if ("$arch" == "armhf") {
project.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"--build-arg", "IMAGE=arm32v7/debian:bullseye",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
}
}
}

if ("$arch" == "riscv64") {
project.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
if ("$arch" == "riscv64") {
project.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"--build-arg", "IMAGE=riscv64/ubuntu:jammy",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
}
}

if ("$arch" != "armhf" && "$arch" != "riscv64"){
project.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
}
}


if ("$arch" != "armhf" && "$arch" != "riscv64"){
project.exec {
workingDir "src/main/packaging"
commandLine "docker", "build", "--no-cache", "--pull",
"-t", "adoptium-packages-linux-jdk-debian",
"--build-arg=CONTAINER_REGISTRY=${containerRegistry}",
"-f", "Dockerfile",
getProjectDir().absolutePath + "/src/main/packaging"
}
}

project.exec {
workingDir getRootDir()
Expand Down
Loading