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

resources jar is reproducible by default, no need to strip #17036

Merged
merged 1 commit into from
Sep 28, 2022

Conversation

somdoron
Copy link
Contributor

I tested this both in the CI and locally and it seems the zip operation now yields consistent result and doesn't need the strip jar anymore.

# Rust tests and lints will be skipped. Delete if not intended.
[ci skip-rust]

# Building wheels and fs_util will be skipped. Delete if not intended.
[ci skip-build-wheels]
@somdoron somdoron added the category:internal CI, fixes for not-yet-released features, etc. label Sep 28, 2022
@somdoron somdoron requested a review from stuhood September 28, 2022 06:56
@@ -119,8 +118,6 @@ async def assemble_resources_jar(
)

output_digest = resources_jar_result.output_digest
if jvm.reproducible_jars:
Copy link
Contributor

Choose a reason for hiding this comment

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

Should the option be deprecated?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it is still in use for java and scala jars, just not needed anymore for resources jar.

@somdoron
Copy link
Contributor Author

tests/python/pants_test/pantsd/pantsd_integration_test.py:pantsd_integration failed in 368.85s.

pretty sure it is not related, can you please retrigger it?

@stuhood stuhood enabled auto-merge (squash) September 28, 2022 16:33
@stuhood stuhood merged commit cdf21fc into pantsbuild:main Sep 28, 2022
@somdoron
Copy link
Contributor Author

can this be cherry picked?

@stuhood stuhood added this to the 2.13.x milestone Sep 28, 2022
Eric-Arellano pushed a commit to Eric-Arellano/pants that referenced this pull request Sep 28, 2022
…d#17036)

Remove use of the `[jvm].reproducible_jars` option for resources jars, since they are now deterministic by default.

[ci skip-rust]
[ci skip-build-wheels]
Eric-Arellano pushed a commit to Eric-Arellano/pants that referenced this pull request Sep 28, 2022
…d#17036)

Remove use of the `[jvm].reproducible_jars` option for resources jars, since they are now deterministic by default.

[ci skip-rust]
[ci skip-build-wheels]
Eric-Arellano added a commit that referenced this pull request Sep 29, 2022
…ck of #17036) (#17056)

I tested this both in the CI and locally and it seems the zip operation now yields consistent result and doesn't need the strip jar anymore.

[ci skip-rust]

Co-authored-by: Doron Somech <somdoron@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:internal CI, fixes for not-yet-released features, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants