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

[GR-37095] Adds ability to create jar entries for directories #256

Closed
wants to merge 1 commit into from

Conversation

zakkak
Copy link
Contributor

@zakkak zakkak commented Feb 22, 2022

Just create an .mxkeep file in a directory and any jar distribution
containing this directory will include a jar entry for it. The .mxkeep
file will not be included.

@zakkak
Copy link
Contributor Author

zakkak commented Feb 22, 2022

@gilles-duboscq @olpaw please review.
I followed the .gitkeep convention and used .mxkeep instead of .empty_dir.

@olpaw olpaw self-requested a review February 22, 2022 14:16
Copy link
Member

@olpaw olpaw left a comment

Choose a reason for hiding this comment

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

LGTM

Please also update

version = VersionSpec(...

accordingly in an additional commit.
(Search for # The version must be updated for every PR (checked in CI) in mx.py)

@olpaw olpaw changed the title Adds ability to create jar entries for directories [GR-37095] Adds ability to create jar entries for directories Feb 22, 2022
@zakkak
Copy link
Contributor Author

zakkak commented Feb 22, 2022

Please also update

version = VersionSpec(...

accordingly in an additional commit. (Search for # The version must be updated for every PR (checked in CI) in mx.py)

What should I add as the PR reference next to the version? GH-256?

@fniephaus
Copy link
Member

What should I add as the PR reference next to the version? GH-256?

Yes, that should work. Thanks!

@olpaw
Copy link
Member

olpaw commented Feb 22, 2022

What should I add as the PR reference next to the version? GH-256?

Yes, that should work. Thanks!

Even better, use GR-37095 (see #256 (comment))

Just create an .mxkeep file in a directory and any jar distribution
containing this directory will include a jar entry for it. The .mxkeep
file will not be included.
@zakkak
Copy link
Contributor Author

zakkak commented Feb 22, 2022

Done :)

@dougxc
Copy link
Member

dougxc commented Feb 22, 2022

@olpaw @fniephaus it's usually better to update version with a separate commit in the internal PR used to integrate a GitHub PR. That way, an external committer does not have to try "win" the version bump race.

@olpaw
Copy link
Member

olpaw commented Feb 22, 2022

@olpaw @fniephaus it's usually better to update version with a separate commit in the internal PR used to integrate a GitHub PR. That way, an external committer does not have to try "win" the version bump race.

I see. If there is a conflict I will replace @zakkak version update commit with my own.

@dougxc
Copy link
Member

dougxc commented Feb 22, 2022

For reference, the motivation for this change is here: oracle/graal#4327 (comment)

@olpaw olpaw self-requested a review February 22, 2022 15:09
Copy link
Member

@gilles-duboscq gilles-duboscq 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.

@olpaw
Copy link
Member

olpaw commented Feb 23, 2022

Merged as 39ac3b7

@olpaw olpaw closed this Feb 23, 2022
@zakkak zakkak deleted the fix-for-testing-graal-4327 branch February 23, 2022 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants