Skip to content

Merge upstream graalvm-community-jdk21u/master into mandrel/23.1 (2026-05-13)#974

Merged
zakkak merged 3 commits into
graalvm:mandrel/23.1from
Karm:sync-upstream-1778667357093
May 13, 2026
Merged

Merge upstream graalvm-community-jdk21u/master into mandrel/23.1 (2026-05-13)#974
zakkak merged 3 commits into
graalvm:mandrel/23.1from
Karm:sync-upstream-1778667357093

Conversation

@Karm
Copy link
Copy Markdown
Collaborator

@Karm Karm commented May 13, 2026

Merge upstream graalvm-community-jdk21u/master into mandrel/23.1 (2026-05-13)

This is a merge from upstream which includes the following upstream changes:

Karm added 3 commits April 14, 2026 12:17
…66602

Unmark suite files and bump version to 23.1.12 [skip ci]
…6-05-13)

This is a merge from upstream which includes the following upstream changes:
* graalvm/graalvm-community-jdk21u#278
@Karm Karm added this to the 23.1.12.0 milestone May 13, 2026
@Karm Karm requested review from galderz, jerboaa and zakkak May 13, 2026 10:16
@oracle-contributor-agreement oracle-contributor-agreement Bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label May 13, 2026
@Karm Karm self-assigned this May 13, 2026
@Karm
Copy link
Copy Markdown
Collaborator Author

Karm commented May 13, 2026

@zakkak @jerboaa This PR was created as:

karm@laptop:~/workspaceRH/mandrel-packaging/release-scripts (new-release-infra *)$ ./mandrel-ops.java sync-upstream --dir /home/karm/tmp/mandrel_23.1 --fork Karm/graal --repo graalvm/mandrel --base-branch mandrel/23.1 --next-version 23.1.12.0 --upstream-url https://github.com/graalvm/graalvm-community-jdk21u.git --upstream-branch master
Fetching master from https://github.com/graalvm/graalvm-community-jdk21u.git
Merging upstream branch into current branch.
Resolved conflict in: /home/karm/tmp/mandrel_23.1/truffle/mx.truffle/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/substratevm/mx.substratevm/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/compiler/mx.compiler/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/espresso/mx.espresso/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/vm/mx.vm/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/wasm/mx.wasm/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/regex/mx.regex/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/sdk/mx.sdk/suite.py
Resolved conflict in: /home/karm/tmp/mandrel_23.1/tools/mx.tools/suite.py
GPG Key (fingerprint d72501ba9a2a624b000f38858cdbce4379381fc4)
Passphrase: 
Pushing branch to fork git@github.com:Karm/graal.git
Assigning Sync PR to milestone: 23.1.12.0
PR created: https://github.com/graalvm/mandrel/pull/974

So the issue with not automatically assigning milestones is fixed.
It's also fixed that the script doesn't make up "release" attributes in suite.py.

Copy link
Copy Markdown
Collaborator

@zakkak zakkak left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @Karm

@zakkak zakkak merged commit 90f9f16 into graalvm:mandrel/23.1 May 13, 2026
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

OCA Verified All contributors have signed the Oracle Contributor Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants