From c65e5931c55634ed5930555492f6a55230f82149 Mon Sep 17 00:00:00 2001
From: Adrian Szuszkiewicz <adrianszuszkiewicz@gmail.com>
Date: Sun, 17 Mar 2024 14:02:06 +0100
Subject: [PATCH] Combine targets

(References: #42)
---
 .github/workflows/build-macos.yml     | 9 ++-------
 MoonshineSDKInstaller/build/build.xml | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 321d093..56a7ea9 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -123,16 +123,11 @@ jobs:
     - name: Build with Ant      
       run: >
         ant 
-        -buildfile MoonshineSDKInstaller/build/build.xml build
+        -buildfile MoonshineSDKInstaller/build/build.xml build pack-and-sign
         -Dapp.version=${{ inputs.version }}
         -Dbuild.is.development=${{ inputs.env != 'production' }}
-
-    - name: Sign Pack with Ant
-      run: >
-        ant 
-        -buildfile MoonshineSDKInstaller/build/build.xml pack-and-sign
         -Dkeychain.name=build.keychain
-        -Dnotarytool.profile="notarytool-profile"
+        -Dnotarytool.profile="notarytool-profile"       
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
diff --git a/MoonshineSDKInstaller/build/build.xml b/MoonshineSDKInstaller/build/build.xml
index 5d7381b..abb26c0 100644
--- a/MoonshineSDKInstaller/build/build.xml
+++ b/MoonshineSDKInstaller/build/build.xml
@@ -376,6 +376,9 @@
 
 	<!-- ANCHOR - Sign macOS app -->
 	<target name="sign-macos-app">
+		<echo message="Kechain: ${keychain.name}"/>
+		<echo message="Notarytool Profile: ${notarytool.profile}"/>
+
 		<!-- Show Nuber of Developer ID Application Certificates -->
 		<exec executable="bash" outputproperty="certs.application.in.keychain">
             <arg value="-c"/>