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

Skip internal signing phase unless on windows/mac #1137

Merged
merged 1 commit into from
Nov 7, 2024

Conversation

sxa
Copy link
Member

@sxa sxa commented Nov 7, 2024

The implementation of the internal signing phase which was adjusted in #1117 (issue) caused that phase to be executed on more platforms than is necessary.

There are two fixes in here:

  • trim() the output from ls when setting build_path so that it doesn't have a newline character on it (This was already done for windows but not on mac, but is required there too).
  • Ensure that the internal signing + assemble phases are only executed on macos and windows. It was trying to run on Linux platforms and tripping up on the stash operations

Notes / alternative options:

  • We could have a separate build flag for the internal signing instead of using ENABLE_SIGNER for both signing situations instead of doing this on a platform basis (probably a good idea in the future)
  • This has been tested on Linux and macos and appears to do what is expected. Windows will take a little longer due to build times, but since macos looks ok this is likely safe to merge now.
  • signing issues are not caught during the PR testing process. We could perhaps look at incorporating that in the future.

@sxa sxa added the buildbreak High priority issues that cause build breaks in jenkins or build scripts label Nov 7, 2024
@sxa sxa self-assigned this Nov 7, 2024
Copy link

github-actions bot commented Nov 7, 2024

Thank you for creating a pull request!

Please check out the information below if you have not made a pull request here before (or if you need a reminder how things work).

Code Quality and Contributing Guidelines

If you have not done so already, please familiarise yourself with our Contributing Guidelines and Code Of Conduct, even if you have contributed before.

Tests

Github actions will run a set of jobs against your PR that will lint and unit test your changes. Keep an eye out for the results from these on the latest commit you submitted. For more information, please see our testing documentation.

In order to run the advanced pipeline tests (executing a set of mock pipelines), it requires an admin to post run tests on this PR.
If you are not an admin, please ask for one's attention in #infrastructure on Slack or ping one here.
To run full set of tests, use "run tests"; a subset of tests on specific jdk version, use "run tests quick 11,21"

Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

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

Looks good.

@smlambert smlambert merged commit 174a0c1 into adoptium:master Nov 7, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
buildbreak High priority issues that cause build breaks in jenkins or build scripts jenkins-pipeline mac testing windows
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants