Skip to content

upgrade java_tools to 17.0 and wire up linux aarch64 prebuilts #334

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

Closed
wants to merge 1 commit into from
+33 −17
Closed

upgrade java_tools to 17.0 and wire up linux aarch64 prebuilts #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .bazelci/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ flags_workspace_integration: &flags_workspace_integration
buildifier: latest

matrix:
all_platforms: ["ubuntu2004", "macos", "macos_arm64", "windows"]
all_platforms: ["rockylinux8_arm64", "ubuntu2004", "macos", "macos_arm64", "windows"]
bazel: ["7.6.1", "8.4.0", "last_green"] # Bazel 6 tested separately, needs different flags
modern_bazel: ["last_green", "rolling"] # Fully supported Bazel versions

Expand Down
1 change: 1 addition & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ toolchains = use_extension("//java:extensions.bzl", "toolchains")
# Declare remote java tools repos
use_repo(toolchains, "remote_java_tools")
use_repo(toolchains, "remote_java_tools_linux")
use_repo(toolchains, "remote_java_tools_linux_aarch64")
use_repo(toolchains, "remote_java_tools_windows")
use_repo(toolchains, "remote_java_tools_darwin_x86_64")
use_repo(toolchains, "remote_java_tools_darwin_arm64")
Expand Down
37 changes: 21 additions & 16 deletions java/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,38 @@ load("//toolchains:remote_java_repository.bzl", "remote_java_repository")

# visible for tests
JAVA_TOOLS_CONFIG = {
"version": "v16.0",
"version": "v17.0",
"release": "true",
"artifacts": {
"java_tools_linux": {
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_linux-v16.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_linux-v16.0.zip",
"sha": "7c360c60da9b9079e31f18de198f23a22555dfb7b6e91e3c6a7103127b1a8538",
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_linux-v17.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_linux-v17.0.zip",
"sha": "5f89d5d04b41dbe1d661836b6a76c468113e0080953bcd72aaf6711c7462b86a",
},
"java_tools_linux_aarch64": {
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_linux_aarch64-v17.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_linux_aarch64-v17.0.zip",
"sha": "c36a17057e895b260cb8f2f7961ed7480812ab6923dab5a39f0c93263e2f76f2",
},
"java_tools_windows": {
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_windows-v16.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_windows-v16.0.zip",
"sha": "b41faa85fceeb2f852e48d51d000d3bf4f29da86ee61d0fc8cca46d297bccf22",
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_windows-v17.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_windows-v17.0.zip",
"sha": "3ae5075b228ce464c74bd23602a65016f662895556fa8952cba2995d50904c86",
},
"java_tools_darwin_x86_64": {
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_darwin_x86_64-v16.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_darwin_x86_64-v16.0.zip",
"sha": "a41de64afb663bb4880af52b55886098241b9222ee8ec1a0f6258d006ba247fb",
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_darwin_x86_64-v17.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_darwin_x86_64-v17.0.zip",
"sha": "c65a181af0e723ed1a36c494aa0f70753f128adb7655a7b57f8f7e71217ad35c",
},
"java_tools_darwin_arm64": {
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_darwin_arm64-v16.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_darwin_arm64-v16.0.zip",
"sha": "b79900dccca7c26fbae9a38c4da80987445e07194517ec53e169c45f1a88c7be",
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_darwin_arm64-v17.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_darwin_arm64-v17.0.zip",
"sha": "00787917e359e2218953dbc30e228670e83fa20c4a0a5f914e0b6ecdee85fa9d",
},
"java_tools": {
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools-v16.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools-v16.0.zip",
"sha": "d8b126078705e91677db67b05f7b25ad6fa8865949e2dd38ff85e0553bfb0be2",
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools-v17.0.zip",
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools-v17.0.zip",
"sha": "9a441ca2d4ae393edd305b0e465b0ed8ee86b22123c41c26455fb856bf9bc897",
},
},
}
Expand Down
1 change: 1 addition & 0 deletions test/repo/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use_repo(
"remote_java_tools_darwin_arm64",
"remote_java_tools_darwin_x86_64",
"remote_java_tools_linux",
"remote_java_tools_linux_aarch64",
"remote_java_tools_windows",
"remotejdk11_linux",
"remotejdk11_linux_aarch64",
Expand Down
9 changes: 9 additions & 0 deletions toolchains/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ cc_library(
)
for OS in [
"linux",
"linux_aarch64",
"darwin_x86_64",
"darwin_arm64",
"windows",
Expand All @@ -207,6 +208,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":ijar_prebuilt_binary_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows",
"//conditions:default": "@remote_java_tools//:ijar_cc_binary",
}),
Expand All @@ -218,6 +220,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
"@bazel_tools//src/conditions:linux_aarch64": "ijar_prebuilt_binary_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows",
}),
)
Expand All @@ -233,6 +236,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_singlejar_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows",
"//conditions:default": "@remote_java_tools//:singlejar_cc_bin",
}),
Expand All @@ -244,6 +248,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_singlejar_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows",
}),
)
Expand All @@ -259,6 +264,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_one_version_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_one_version_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_one_version_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_one_version_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":prebuilt_one_version_windows",
"//conditions:default": "@remote_java_tools//:one_version_cc_bin",
}),
Expand All @@ -270,6 +276,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_one_version_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_one_version_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_one_version_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_one_version_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":prebuilt_one_version_windows",
}),
)
Expand All @@ -285,6 +292,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":turbine_direct_graal_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":turbine_direct_graal_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":turbine_direct_graal_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":turbine_direct_graal_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":turbine_direct_graal_windows",
"//conditions:default": "@remote_java_tools//:TurbineDirect",
}),
Expand All @@ -296,6 +304,7 @@ alias(
"@bazel_tools//src/conditions:darwin_arm64": ":turbine_direct_graal_darwin_arm64",
"@bazel_tools//src/conditions:darwin_x86_64": ":turbine_direct_graal_darwin_x86_64",
"@bazel_tools//src/conditions:linux_x86_64": ":turbine_direct_graal_linux",
"@bazel_tools//src/conditions:linux_aarch64": ":turbine_direct_graal_linux_aarch64",
"@bazel_tools//src/conditions:windows": ":turbine_direct_graal_windows",
}),
)
Expand Down