From d6fc243add2b704bda776f13dc13a86534ff4e2b Mon Sep 17 00:00:00 2001
From: Joacim Breiler <joacim@breiler.com>
Date: Mon, 9 Oct 2023 21:09:20 +0200
Subject: [PATCH] Fixed typo in build scripts (#2337)

---
 .github/workflows/release.yaml   | 8 ++------
 ugs-platform/application/pom.xml | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 14131ba13..017b724d0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -38,12 +38,8 @@ jobs:
         export CHANGELIST=""
         echo "Packaging version ${REVISION}${CHANGELIST}"
         mvn package -pl ugs-classic assembly:assembly -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
-        mvn package -pl ugs-platform/application -P create-macosx-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
-        mvn package -pl ugs-platform/application -P create-win32-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
-        mvn package -pl ugs-platform/application -P create-win64-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
-        mvn package -pl ugs-platform/application -P create-linux-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
-        mvn package -pl ugs-platform/application -P create-pi-package -DskipTests=true -Drevision=${REVISION} -Dchangelist=${CHANGELIST}
-    
+        mvn package -pl ugs-platform/application -P create-macosx-x64-package,create-macosx-aarch64-package,create-win32-package,create-win64-package,create-linux-x64-package,create-linux-arm-package,create-linux-aarch64-package -DskipTests=true
+
     # https://github.com/marketplace/actions/upload-to-github-release
     - name: Upload binaries to snapshot release
       uses: xresloader/upload-to-github-release@v1
diff --git a/ugs-platform/application/pom.xml b/ugs-platform/application/pom.xml
index 63ab5d3fb..9140aa668 100644
--- a/ugs-platform/application/pom.xml
+++ b/ugs-platform/application/pom.xml
@@ -421,7 +421,7 @@
                                         <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
                                             <fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
                                             <fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
-                                            <fileset dir="${project.build.directory}/macos-x64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/macosx-x64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
                                         </delete>
 
                                         <!-- Create folders -->
@@ -515,7 +515,7 @@
                                             <arg value="${ugs.appbundle.name}"/>
                                             <arg value="-r"/>
                                             <arg value="-o"/>
-                                            <arg value="macos-x64-${project.artifactId}-${project.version}.dmg"/>
+                                            <arg value="macosx-x64-${project.artifactId}-${project.version}.dmg"/>
                                             <arg value="${project.build.directory}/${ugs.app.title}"/>
                                         </exec>
                                     </target>
@@ -549,7 +549,7 @@
                                         <delete includeEmptyDirs="true" failonerror="false" removeNotFollowedSymlinks="true">
                                             <fileset dir="${project.build.directory}/${ugs.appbundle.name}.app" followsymlinks="false"/>
                                             <fileset dir="${project.build.directory}/${ugs.app.title}" followsymlinks="false"/>
-                                            <fileset dir="${project.build.directory}/macos-aarch64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
+                                            <fileset dir="${project.build.directory}/macosx-aarch64-${project.artifactId}-${project.version}.dmg" followsymlinks="false"/>
                                         </delete>
 
                                         <!-- Create folders -->
@@ -643,7 +643,7 @@
                                             <arg value="${ugs.appbundle.name}"/>
                                             <arg value="-r"/>
                                             <arg value="-o"/>
-                                            <arg value="macos-aarch64-${project.artifactId}-${project.version}.dmg"/>
+                                            <arg value="macosx-aarch64-${project.artifactId}-${project.version}.dmg"/>
                                             <arg value="${project.build.directory}/${ugs.app.title}"/>
                                         </exec>
                                     </target>