better notary logs

Author: StephenHodgson

README.md

@@ -67,6 +67,7 @@ This action requires several secrets that need to be setup in the repository or
 | `export-option-plist` | The path to custom export option plist file to use when exporting the Xcode project. | Overrides `export-option`. |
 | `entitlements-plist` | The path to custom entitlements plist file. | Generates [default hardened runtime entitlements](https://developer.apple.com/documentation/security/hardened-runtime) if not provided. |
 | `notarize` | Whether to notarize the exported Xcode project. | Defaults to `true` if `export-option !== app-store-connect`. |
+| `archive-type` | The archive type to use when exporting macOS applications when not uploading to the App Store. Can be one of `app`, `dmg`, or `pkg`. | Defaults to `app`. Forces `app` if `export-option === steam`. |
 | `upload` | Whether to upload the exported Xcode project to App Store Connect. | Defaults to `true` if `export-option === app-store-connect`. |
 | `whats-new` | When `uploading === true`, Let your testers know what you would like them to test in this build. This information will be available to testers in all groups who have access to this build. | Defaults to the last git commit sha, current branch name, and commit message. |
 | `auto-increment-build-number` | Whether to automatically increment the CFBundleVersion in the Xcode project. | Defaults to `true` if `export-option === app-store-connect`. |

action.yml

@@ -70,6 +70,10 @@ inputs:
   notarize:
     description: Whether to notarize the exported Xcode project. Apps to be uploaded to Steam must be notarized by Apple. Defaults to `true` if `export-option === steam`.
     required: false
+  archive-type:
+    description: The archive type to use when exporting macOS applications when not uploading to the App Store. Can be one of `app`, `dmg`, or `pkg`. Defaults to `app`. Forces `app` if `export-option === steam`.
+    required: false
+    default: app
   upload:
     description: Whether to upload the exported Xcode project to App Store Connect. Defaults to `true` if `export-option === app-store-connect`.
     required: false

dist/index.js

@@ -58593,7 +58593,8 @@ async function notarizeArchive(projectRef, archivePath, staplePath) {
     core.debug(notarizeOutput);
     const notaryResult = JSON.parse(notarizeOutput);
     if (notaryResult.status !== 'Accepted') {
-        throw new Error(`Notarization failed! Status: ${notaryResult.status} | ${notaryResult.message}`);
+        const notaryLogs = await getNotarizationLog(projectRef, notaryResult.id);
+        throw new Error(`Notarization failed! Status: ${notaryResult.status}\n${notaryLogs}`);
     }
     const stapleArgs = [
         'stapler',
@@ -58618,6 +58619,33 @@ async function notarizeArchive(projectRef, archivePath, staplePath) {
     }
     core.info(stapleOutput);
 }
+async function getNotarizationLog(projectRef, id) {
+    let output = '';
+    const notaryLogArgs = [
+        'notarytool',
+        'log',
+        id,
+        '--key', projectRef.credential.appStoreConnectKeyPath,
+        '--key-id', projectRef.credential.appStoreConnectKeyId,
+        '--issuer', projectRef.credential.appStoreConnectIssuerId,
+        '--team-id', projectRef.credential.teamId,
+    ];
+    if (core.isDebug()) {
+        notaryLogArgs.push('--verbose');
+    }
+    const logExitCode = await (0, exec_1.exec)(xcrun, notaryLogArgs, {
+        listeners: {
+            stdout: (data) => {
+                output += data.toString();
+            }
+        },
+        ignoreReturnCode: true
+    });
+    if (logExitCode !== 0) {
+        throw new Error(`Failed to get notarization log!`);
+    }
+    core.info(output);
+}
 async function getExportOptions(projectRef) {
     const exportOptionPlistInput = core.getInput('export-option-plist');
     let exportOptionsPath = undefined;

dist/index.js.map

@@ -583,7 +583,8 @@ async function notarizeArchive(projectRef: XcodeProject, archivePath: string, st
     // {"message":"Processing complete","id":"e0595a17-0db3-42a5-afa9-da2891716ba8","status":"Accepted"}
     const notaryResult = JSON.parse(notarizeOutput);
     if (notaryResult.status !== 'Accepted') {
-        throw new Error(`Notarization failed! Status: ${notaryResult.status} | ${notaryResult.message}`);
+        const notaryLogs = await getNotarizationLog(projectRef, notaryResult.id);
+        throw new Error(`Notarization failed! Status: ${notaryResult.status}\n${notaryLogs}`);
     }
     const stapleArgs = [
         'stapler',
@@ -609,6 +610,34 @@ async function notarizeArchive(projectRef: XcodeProject, archivePath: string, st
     core.info(stapleOutput);
 }
 
+async function getNotarizationLog(projectRef: XcodeProject, id: string) {
+    let output = '';
+    const notaryLogArgs = [
+        'notarytool',
+        'log',
+        id,
+        '--key', projectRef.credential.appStoreConnectKeyPath,
+        '--key-id', projectRef.credential.appStoreConnectKeyId,
+        '--issuer', projectRef.credential.appStoreConnectIssuerId,
+        '--team-id', projectRef.credential.teamId,
+    ];
+    if (core.isDebug()) {
+        notaryLogArgs.push('--verbose');
+    }
+    const logExitCode = await exec(xcrun, notaryLogArgs, {
+        listeners: {
+            stdout: (data: Buffer) => {
+                output += data.toString();
+            }
+        },
+        ignoreReturnCode: true
+    });
+    if (logExitCode !== 0) {
+        throw new Error(`Failed to get notarization log!`);
+    }
+    core.info(output);
+}
+
 async function getExportOptions(projectRef: XcodeProject): Promise<void> {
     const exportOptionPlistInput = core.getInput('export-option-plist');
     let exportOptionsPath = undefined;