8371924: --mac-app-store should be accepted option for app image signing#30346
8371924: --mac-app-store should be accepted option for app image signing#30346alexeysemenyukoracle wants to merge 7 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into |
|
@alexeysemenyukoracle This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 42 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
@alexeysemenyukoracle The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
0221326 to
b6aa63d
Compare
…entitlements validation of additional launchers in two-phase app image packaging/signing scenarios; add missing verifyMutable() calls; SigningAppImageTwoStepsTest: follow-up change
b6aa63d to
cd39555
Compare
|
@sashamatveev PTAL |
Webrevs
|
sashamatveev
left a comment
There was a problem hiding this comment.
If I remember correctly we used to read app store value from .jpackage.xml when doing predefined app image signing to figure out how we should sign it. What is good reason to sign predefined app image for app store if it was not generated for app store?
| if (MAC_APP_STORE.containsIn(options)) { | ||
| appStore = MAC_APP_STORE.getFrom(options); | ||
| } else if (PREDEFINED_APP_IMAGE.containsIn(options)) { | ||
| final var appImageFileOptions = appBuilder.externalApplication().orElseThrow().extra(); | ||
| appStore = MAC_APP_STORE.getFrom(appImageFileOptions); | ||
| } else { | ||
| appStore = MAC_APP_STORE.getFrom(options); | ||
| appStore = false; |
There was a problem hiding this comment.
I do not see any difference between old and new code. Can you explain?
There was a problem hiding this comment.
The old code read the "app-store" property from the predefined image and ignored the value specified on the command line. The new code reads "app-store" property from the command line first. If not found, it reads it from the predefined image.
|
|
||
| var testAL = new AdditionalLauncher("testAL"); | ||
| testAL.applyTo(cmd); | ||
| cmd.executeAndAssertHelloAppImageCreated(); |
There was a problem hiding this comment.
Because it runs jpackage without signing and duplicates line 70.
The app image signing command should sign any given app image. The app image can be one created by jpackage or a fully customized one. A missing flag in the ".jpackage.xml" file should not prevent a user from signing an app image for use with the App Store. |
|
/integrate |
|
Going to push as commit e0fe86b.
Your commit was automatically rebased without conflicts. |
|
@alexeysemenyukoracle Pushed as commit e0fe86b. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Support the use of "--mac-app-store" option when signing predefined app image.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/30346/head:pull/30346$ git checkout pull/30346Update a local copy of the PR:
$ git checkout pull/30346$ git pull https://git.openjdk.org/jdk.git pull/30346/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 30346View PR using the GUI difftool:
$ git pr show -t 30346Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/30346.diff
Using Webrev
Link to Webrev Comment