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

Jump to bottom

Use bundled zlib instead of system for JDK21+ #3399

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Use bundled zlib instead of system for JDK21+ #3399

merged 1 commit into from
Jun 22, 2023

Conversation

sxa
Copy link
Member

@sxa sxa commented Jun 21, 2023

@sxa sxa self-assigned this Jun 21, 2023
@sxa sxa force-pushed the jdk21BundledZlib branch from f7712f8 to ad8be35 Compare June 21, 2023 14:33
@sxa
Copy link
Member Author

sxa commented Jun 21, 2023

Looks like the Linux/jdk head check has failed while downloading the JDK21 boot JDK (GPG check failed), which is unlikely to be realted to this PR. It may somehow be related to the publication of "ea" releases in some way ... #3355

@sxa
build.sh: Always use --with-zlib=bundled for JDK21+
3bdb0ef 
Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa sxa force-pushed the jdk21BundledZlib branch from ad8be35 to 3bdb0ef Compare June 21, 2023 17:06
@sxa
Copy link
Member Author

sxa commented Jun 21, 2023

(Rebased to pick up latest cacerts since the checks failed the count validation)

@karianna
Copy link
Contributor

jdk8u on Mac fails as well, but seems unrelated

@sxa
Copy link
Member Author

sxa commented Jun 22, 2023

Linux failure will be fixed by #3401 - unrelated to this PR

@sxa
Copy link
Member Author

sxa commented Jun 22, 2023

jdk8u on Mac fails as well, but seems unrelated

The mac one is particularly odd:

clang: error: no such file or directory: '/dev/fd/8'
clang: error: no input files
dtrace: failed to compile script /Users/runner/work/temurin-build/temurin-build/workspace/build/src/hotspot/src/os/bsd/dtrace/hotspot_jni.d: Preprocessor failed to process input program

Re-running at https://github.com/adoptium/temurin-build/actions/runs/5344957027/jobs/9689991298?pr=3401 and it looks to have passed that point.

andrew-m-leonard
andrew-m-leonard approved these changes Jun 22, 2023
View reviewed changes
Copy link
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@sxa sxa requested a review from andrew-m-leonard June 22, 2023 13:38
@sxa sxa merged commit fd04245 into adoptium:master Jun 22, 2023
@sxa sxa mentioned this pull request Aug 11, 2023
Closed
AdamBrousseau added a commit to AdamBrousseau/openjdk-build that referenced this pull request Sep 6, 2023
@AdamBrousseau
Only bundle zlib on Temurin
e02fb44 
Related adoptium#1951
adoptium#3399
adoptium#3459

Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
@AdamBrousseau AdamBrousseau mentioned this pull request Sep 6, 2023
Merged
@pshipton pshipton mentioned this pull request Sep 12, 2023
Closed
@sxa sxa mentioned this pull request Oct 17, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdams gdams gdams approved these changes

@andrew-m-leonard andrew-m-leonard Awaiting requested review from andrew-m-leonard

Assignees

@sxa sxa

Labels
None yet
Projects
No open projects
Adoptium 2Q 2023 Plan
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sxa @karianna @gdams @andrew-m-leonard