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.

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

[24.0] Sync with upstream for July 2024 CPU #771

Merged
merged 168 commits into from
Jul 19, 2024

Conversation

zakkak
Copy link
Collaborator

@zakkak zakkak commented Jul 17, 2024

Sync with upstream 'oracle/release/graal-vm/24.0' for July 2024 CPU

Merged cleanly except for:

  1. oracle@7c93032 which conflicts with our earlier backport in [24.0] Adopt "JDK-8324646: Avoid Class.forName in SecureRandom constructor" #722. To deviate as little as possible from upstream I dropped our backport in favour of the upstream one.

  2. The suite files were updated to match the Mandrel version scheme, i.e. the version is set to 24.0.2.0 instead of 24.0.2, and the Release value is set to False.

marwan-hallaoui and others added 30 commits April 9, 2024 11:35
(cherry picked from commit f0a6a9c)
(cherry picked from commit 83b936a)
(cherry picked from commit 8acba5c)
(cherry picked from commit 77b88cc)
(cherry picked from commit 4fdcc7c)
(cherry picked from commit 05e25e0)
(cherry picked from commit a54f2eb)
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jul 17, 2024
@zakkak zakkak force-pushed the 2024-07-17-july-cpu-2024-sync branch from 68b478d to b383a25 Compare July 17, 2024 08:47
@zakkak zakkak requested review from jerboaa and Karm July 17, 2024 08:47
@zakkak zakkak changed the title Sync with upstream for July 2024 CPU [24.0] Sync with upstream for July 2024 CPU Jul 17, 2024
@zakkak zakkak added this to the 24.0.2.0-Final milestone Jul 17, 2024
@zakkak
Copy link
Collaborator Author

zakkak commented Jul 17, 2024

Build fails with:

Exception in thread "main" java.lang.IllegalArgumentException: Version should be of the form MAJOR.MINOR.PATCH not 7.4.1.1
	at MxVersion.<init>(build.java:1529)
	at Mx.<init>(build.java:926)
	at build.main(build.java:58)

Looking

Merged cleanly except for:

1. oracle@7c93032
which conflicts with our earlier backport in
graalvm#722. To deviate as little as
possible from upstream I dropped our backport in favour of the upstream
one.

2. The suite files were updated to match the Mandrel version scheme,
i.e. the version is set to 24.0.2.0 instead of 24.0.2, and the Release
value is set to False.
@zakkak zakkak force-pushed the 2024-07-17-july-cpu-2024-sync branch from b383a25 to 0b56897 Compare July 17, 2024 12:01
@zakkak
Copy link
Collaborator Author

zakkak commented Jul 17, 2024

CI failure is:

Error:  Failures: 
Error:    DebugSymbolsTest.debugSymbolsQuarkus:306 build-and-run.log log should not contain error or warning lines that are not whitelisted. See /home/runner/work/mandrel/mandrel/mandrel-integration-tests/testsuite/target/archived-logs/org.graalvm.tests.integration.DebugSymbolsTest/debugSymbolsQuarkus/build-and-run.log and check these offending lines: 
WARNING: Duplicate name in Manifest: Specification-Version.
WARNING: Duplicate name in Manifest: Implementation-Version. ==> expected: <true> but was: <false>
Error:    JFRTest.jfrPerfTest:185->jfrPerfTestRun:234 build-and-run.log log should not contain error or warning lines that are not whitelisted. See /home/runner/work/mandrel/mandrel/mandrel-integration-tests/testsuite/target/archived-logs/org.graalvm.tests.integration.JFRTest/jfrPerfTest/build-and-run.log and check these offending lines: 
WARNING: Duplicate name in Manifest: Specification-Version.
WARNING: Duplicate name in Manifest: Implementation-Version. ==> expected: <true> but was: <false>
Error:    RuntimesSmokeTest.quarkusFullMicroProfile:200->testRuntime:156 build-and-run.log log should not contain error or warning lines that are not whitelisted. See /home/runner/work/mandrel/mandrel/mandrel-integration-tests/testsuite/target/archived-logs/org.graalvm.tests.integration.RuntimesSmokeTest/quarkusFullMicroProfile/build-and-run.log and check these offending lines: 
WARNING: Duplicate name in Manifest: Specification-Version.
WARNING: Duplicate name in Manifest: Implementation-Version. ==> expected: <true> but was: <false>
[INFO] 

It's irrelevant to this sync. I will backport graalvm/mandrel-packaging#435 to 24.0 to fix it.

Update: The backport PR is graalvm/mandrel-packaging#438

@jerboaa
Copy link
Collaborator

jerboaa commented Jul 19, 2024

@zakkak Could you please trigger another CI run. The Mandrel IT failure should be gone with the backport.

Copy link
Collaborator

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This seems OK. Please trigger a CI run which should be clean before we merge.

@zakkak
Copy link
Collaborator Author

zakkak commented Jul 19, 2024

maven-tooling failed due to:

Error during callback: com.github.dockerjava.api.exception.InternalServerErrorException: Status 500: {"message":"toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit"}

Rerunning only the corresponding batch of tests, should take ~1 hour

@Karm
Copy link
Collaborator

Karm commented Jul 19, 2024

@zakkak

quarkusio/quarkus#40960

:(

@jerboaa
Copy link
Collaborator

jerboaa commented Jul 19, 2024

Looks good now.

@zakkak zakkak merged commit ccf6db8 into graalvm:mandrel/24.0 Jul 19, 2024
46 checks passed
@zakkak zakkak deleted the 2024-07-17-july-cpu-2024-sync branch July 19, 2024 15:52
@Karm
Copy link
Collaborator

Karm commented Jul 20, 2024

Thx.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/JDK22 affects/24.0 OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.