Skip to content
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

conf-openjdk: add Ubuntu-family support #25980

Merged
merged 9 commits into from
Aug 22, 2024
Merged

conf-openjdk: add Ubuntu-family support #25980

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
900e5a5
conf-openjdk: add Ubuntu-family support
jmid May 30, 2024
a44d0ba
Add a PATH hint to users upon install failure
jmid Jul 3, 2024
16d18a4
Install a specific FreeBSD openjdk package
jmid Jul 3, 2024
bab85bf
Remove arbitrary freebsd openjdk19 depext again
jmid Jul 4, 2024
899e70f
Add FreeBSD install failure advice
jmid Jul 4, 2024
f723d51
Mark FreeBSD as an acceptable CI failure
jmid Jul 4, 2024
3e9c57b
Mark remaining platforms as expected failures
jmid Aug 13, 2024
aabaa4e
Correct platform names
jmid Aug 14, 2024
cde4bfd
Correct x86_32 platform name
jmid Aug 14, 2024
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
21 changes: 19 additions & 2 deletions packages/conf-openjdk/conf-openjdk.1/opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,32 @@ authors: "OpenJDK and Java Community"
license: "GPLv2 with linking exception"
build: ["javac" "-version"]
depexts: [
["default-jdk"] {os-family = "debian"}
["default-jdk"] {os-family = "debian" | os-family = "ubuntu"}
["java-latest-openjdk-devel"] {os-distribution = "fedora"}
["java-latest-openjdk-devel"] {os-distribution = "rhel"}
["java-latest-openjdk-devel"] {os-distribution = "ol"}
["java-latest-openjdk-devel"] {os-distribution = "centos"}
["jdk-openjdk"] {os-distribution = "arch"}
["openjdk"] {os-distribution = "freebsd"}
["openjdk"] {os-distribution = "homebrew" & os = "macos"}
]
x-ci-accept-failures: [
# requires the user to install a specific openjdk version
"freebsd"
# these fail CI as PATH does not include javac
"alpine-3.20"
"opensuse-15.6"
"opensuse-tumbleweed"
"macos-homebrew"
# x86_32 is debian-12-ocaml-4.14/i386
"debian-12"
]
post-messages: [
"Please ensure that the javac binary is installed and is available in PATH"
{failure}
"""
You may need to first install a version of openjdk, e.g., openjdk19"""
{failure & os-distribution = "freebsd"}
]
synopsis: "Virtual package relying on OpenJDK / Javac"
description:
"This package can only install if the javac binary is installed on the system."
Expand Down