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

Exclude man page symlink in distribution #2602

Merged
merged 1 commit into from
Mar 25, 2022

Conversation

andrross
Copy link
Member

This is a short-term solution to unblock the build process for the 1.3
release. A tool used in that process (cpio) is failing on a symlink in
the JDK man pages, so this is a hack to just remove that symlink. See
issue #2517 for more details.

Signed-off-by: Andrew Ross [email protected]

Issues Resolved

#2517

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

This is a short-term solution to unblock the build process for the 1.3
release. A tool used in that process (cpio) is failing on a symlink in
the JDK man pages, so this is a hack to just remove that symlink. See
issue opensearch-project#2517 for more details.

Signed-off-by: Andrew Ross <[email protected]>
Copy link
Contributor

@xuezhou25 xuezhou25 left a comment

Choose a reason for hiding this comment

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

Thank you very much for help, Andrew :)

@andrross
Copy link
Member Author

Manual testing done:

$ ./gradlew distribution:packages:rpm:build
$ mkdir tmp && cd tmp && rpm2cpio ../distribution/packages/rpm/build/distributions/opensearch-min-1.3.1-SNAPSHOT.x86_64.rpm | cpio -imdv
$ ls usr/share/opensearch/jdk/man
ja_JP.UTF-8  man1

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 7c8f669
Log 3767

Reports 3767

@peterzhuamazon
Copy link
Member

Seems like WS stuck on the runs, takes significantly longer time and still running.

@peterzhuamazon peterzhuamazon merged commit c4c0672 into opensearch-project:1.3 Mar 25, 2022
@andrross andrross deleted the 1.3 branch March 25, 2022 22:43
@andrross andrross restored the 1.3 branch March 25, 2022 22:43
peterzhuamazon pushed a commit to peterzhuamazon/OpenSearch that referenced this pull request Mar 26, 2022
This is a short-term solution to unblock the build process for the 1.3
release. A tool used in that process (cpio) is failing on a symlink in
the JDK man pages, so this is a hack to just remove that symlink. See
issue opensearch-project#2517 for more details.

Signed-off-by: Andrew Ross <[email protected]>
@dblock
Copy link
Member

dblock commented Mar 28, 2022

@andrross We also need this on main, and backported to 2.x and 2.0, do we?

@andrross
Copy link
Member Author

@dblock As long as we continue using JDK 17 with the newer versions of OpenSearch then we don't need to backport because that JDK doesn't include the problematic symlink.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] OpenSearch Core 1.3.0 including ja in JDK man pages
6 participants