Skip to content

Add ppc64le platform support #274

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
Jenkins-J wants to merge 3 commits into from
+16 −11
Closed

Add ppc64le platform support #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9361ef1
Add ppc64le platform support
Jenkins-J Feb 11, 2025
ead8a39
Add updated platforms dependency to WORKSPACE
Jenkins-J Mar 27, 2025
a12036e
Remove old references to ppc
Jenkins-J Mar 28, 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
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "platforms", version = "0.0.4")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "rules_cc", version = "0.0.15")
bazel_dep(name = "bazel_features", version = "1.11.0")
bazel_dep(name = "bazel_skylib", version = "1.6.1")
Expand Down
10 changes: 3 additions & 7 deletions java/bazel/repositories_util.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ _RELEASE_CONFIGS = {
"adoptium": {
"release": "11.0.26+4",
"platforms": {
"linux": ["ppc", "s390x"],
"linux": ["ppc64le", "s390x"],
},
},
"microsoft": {
Expand All @@ -66,7 +66,7 @@ _RELEASE_CONFIGS = {
"adoptium": {
"release": "17.0.14+7",
"platforms": {
"linux": ["ppc", "s390x"],
"linux": ["ppc64le", "s390x"],
},
},
},
Expand All @@ -82,7 +82,7 @@ _RELEASE_CONFIGS = {
"adoptium": {
"release": "21.0.6+7",
"platforms": {
"linux": ["ppc", "riscv64", "s390x"],
"linux": ["ppc64le", "riscv64", "s390x"],
},
},
},
Expand All @@ -97,8 +97,6 @@ def _name_for_remote_jdk(version, os, cpu):
os_part = "win" if (os == "windows" and version != "8") else os
if cpu == "x86_64":
suffix = ""
elif cpu == "ppc":
suffix = "_ppc64le"
else:
suffix = "_" + cpu
return prefix + version + "_" + os_part + suffix
Expand Down Expand Up @@ -126,8 +124,6 @@ def _zulu_remote_jdk_repo(os, cpu, release):
def _adoptium_linux_remote_jdk_repo(version, cpu, release):
os = "linux"
arch = cpu
if cpu == "ppc":
arch = "ppc64le"
archive_name = "OpenJDK" + version + "U-jdk_" + arch + "_" + os + "_hotspot_" + release.replace("+", "_") + ".tar.gz"
primary_url = "github.com/adoptium/temurin" + version + "-binaries/releases/download/jdk-" + release + "/" + archive_name
urls = [
Expand Down
6 changes: 3 additions & 3 deletions java/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ _REMOTE_JDK_CONFIGS_LIST = [
),
struct(
name = "remotejdk11_linux_ppc64le",
target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:ppc"],
target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:ppc64le"],
sha256 = "42c63651125a149cee2ba781300d75ffa67a25032f95038d50ee6d6177cb2e41",
strip_prefix = "jdk-11.0.26+4",
urls = ["https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26+4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz", "https://mirror.bazel.build/github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26+4/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.26_4.tar.gz"],
Expand Down Expand Up @@ -239,7 +239,7 @@ _REMOTE_JDK_CONFIGS_LIST = [
),
struct(
name = "remotejdk17_linux_ppc64le",
target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:ppc"],
target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:ppc64le"],
sha256 = "f4cb9ee5906a44d110fa381310cd7181d95498d27087d449e7e9b74bddd9def2",
strip_prefix = "jdk-17.0.14+7",
urls = ["https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz", "https://mirror.bazel.build/github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.14_7.tar.gz"],
Expand Down Expand Up @@ -303,7 +303,7 @@ _REMOTE_JDK_CONFIGS_LIST = [
),
struct(
name = "remotejdk21_linux_ppc64le",
target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:ppc"],
target_compatible_with = ["@platforms//os:linux", "@platforms//cpu:ppc64le"],
sha256 = "163724b70b86d5a8461f85092165a9cc5a098ed900fee90d1b0c0be9607ae3d2",
strip_prefix = "jdk-21.0.6+7",
urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6+7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz", "https://mirror.bazel.build/github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.6+7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.6_7.tar.gz"],
Expand Down
9 changes: 9 additions & 0 deletions java/rules_java_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,14 @@ def bazel_skylib_repo():
],
)

def platforms_repo():
maybe(
http_archive,
name = "platforms",
sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f",
urls = ["https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz"],
)

def rules_java_dependencies():
"""An utility method to load non-toolchain dependencies of rules_java.

Expand All @@ -165,3 +173,4 @@ def rules_java_dependencies():
bazel_skylib_repo()
rules_cc_repo()
protobuf_repo()
platforms_repo()