From 01ddded603a398d04e62cc18d78a7a6647e0e104 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sat, 23 Sep 2023 03:37:18 +0200
Subject: [PATCH] CI: Use create-dmg with --skip-jenkins only for macOS arm64

---
 .github/workflows/build.yml | 6 ++++++
 cmake/Dmg.cmake             | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a6f19fee9..66f8d6e0a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -855,9 +855,15 @@ jobs:
         run: make deploycheck
 
       - name: Create DMG
+        if: matrix.runner != 'macos-arm64'
         working-directory: build
         run: make dmg
 
+      - name: Create DMG
+        if: matrix.runner == 'macos-arm64'
+        working-directory: build
+        run: make dmg2
+
       - name: SSH key setup
         if: matrix.runner == 'macos-11' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/ci' || github.ref == 'refs/heads/macos')
         uses: shimataro/ssh-key-action@v2
diff --git a/cmake/Dmg.cmake b/cmake/Dmg.cmake
index 75e0b5412..abee56a19 100644
--- a/cmake/Dmg.cmake
+++ b/cmake/Dmg.cmake
@@ -28,6 +28,10 @@ if(MACDEPLOYQT_EXECUTABLE)
   )
   if(CREATEDMG_EXECUTABLE)
     add_custom_target(dmg
+      COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+    add_custom_target(dmg2
       COMMAND ${CREATEDMG_EXECUTABLE} --volname strawberry --background "${CMAKE_SOURCE_DIR}/dist/macos/dmg_background.png" --app-drop-link 450 218 --icon strawberry.app 150 218 --window-size 600 450 --skip-jenkins strawberry-${STRAWBERRY_VERSION_PACKAGE}-${CMAKE_HOST_SYSTEM_PROCESSOR}.dmg strawberry.app
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     )