Fix macOS notarization (signing), migrate to notarytool
#12735
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamPetho
commented
Mar 27, 2024
Comment on lines
-346
to
-370
| if (result.Contains("The software asset has already been uploaded. The upload ID is")) | ||
| { | ||
| // Example: The software asset has already been uploaded. The upload ID is 7689dc08-d6c8-4783-8d28-33e575f5c967 | ||
| uploadId = result.Split('"').First(line => line.Contains("The software asset has already been uploaded.")).Split("The upload ID is")[^1].Trim(); | ||
| } | ||
| else if (result.Contains("No errors uploading")) | ||
| { | ||
| // Example: <key>RequestUUID</key>\n\t\t<string>2a2a164f-2ae7-4293-8357-5d5a5cdd580a</string> | ||
|
|
||
| var lines = result.Split('\n'); | ||
|
|
||
| for (int i = 0; i < lines.Length; i++) | ||
| { | ||
| string line = lines[i].Trim(); | ||
| if (!line.TrimStart().StartsWith("<key>", StringComparison.InvariantCultureIgnoreCase)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| if (line.Contains("<key>RequestUUID</key>", StringComparison.InvariantCulture)) | ||
| { | ||
| uploadId = lines[i + 1].Trim().Replace("<string>", "").Replace("</string>", ""); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
We don't need the uploadId anymore, so these hacks are obsolete.
Comment on lines
-378
to
-405
| Stopwatch sw = new(); | ||
| sw.Start(); | ||
| while (true) // Wait for the notarization. | ||
| { | ||
| Console.WriteLine($"Checking notarization status. Elapsed time: {sw.Elapsed}"); | ||
| using var process = Process.Start(new ProcessStartInfo | ||
| { | ||
| FileName = "xcrun", | ||
| Arguments = $"altool --notarization-info \"{uploadId}\" -u \"{appleId}\" -p \"{password}\"", | ||
| RedirectStandardError = true, | ||
| RedirectStandardOutput = true, | ||
| }); | ||
| var nonNullProcess = WaitProcessToFinish(process, "xcrum"); | ||
| string result = $"{nonNullProcess.StandardError.ReadToEnd()} {nonNullProcess.StandardOutput.ReadToEnd()}"; | ||
| if (result.Contains("Status Message: Package Approved")) | ||
| { | ||
| break; | ||
| } | ||
| if (result.Contains("Status: in progress")) | ||
| { | ||
| Thread.Sleep(4000); | ||
| continue; | ||
| } | ||
| if (result.Contains("Could not find the RequestUUID")) | ||
| { | ||
| Thread.Sleep(4000); | ||
| continue; | ||
| } |
There was a problem hiding this comment.
No need to periodically send a request to Apple about the notarization's status.
Thanks to the --wait option.
| @@ -327,85 +328,22 @@ private static Process WaitProcessToFinish(Process? process, string processName) | |||
| return process; | |||
| } | |||
|
|
|||
| private static void Notarize(string appleId, string password, string filePath, string bundleIdentifier) | |||
| private static void Notarize(string appleId, string filePath) | |||
There was a problem hiding this comment.
Removed the unused params
molnard
approved these changes
Mar 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #12722
Looks like
altoolis obsolete and that caused the issue.Very useful Apple documentation I used on how to migrate from
altooltonotarytoolhttps://developer.apple.com/documentation/technotes/tn3147-migrating-to-the-latest-notarization-tool
According to the apple documentation:
New process:
notarytool submit --wait --apple-id \"{appleId}\" -p \"WasabiNotarize\" \"{filePath}\"With these changes I was able to do successful notarizations 5 times in a row.
Please review it commit by commit, it's easier.