From bffb927883bc2f2e7c28156a79d134b6c9e79abc Mon Sep 17 00:00:00 2001 From: Holden Date: Wed, 30 Oct 2024 18:31:56 -0400 Subject: [PATCH] CMake: Use create-dmg --- .github/workflows/macos.yml | 4 ++-- cmake/CreateMacDMG.cmake | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 12155f1ad8e..e5d86fdde1b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -56,7 +56,7 @@ jobs: - name: Install Dependencies run: | brew update - brew install cmake ninja ccache geographiclib SDL2 exiv2 expat zlib shapelib pkgconfig + brew install cmake ninja ccache geographiclib SDL2 exiv2 expat zlib shapelib pkgconfig create-dmg # pkgconf - name: Install Gstreamer @@ -114,5 +114,5 @@ jobs: artifact_name: ${{ env.ARTIFACT }} aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - source: 'package' + source: '' github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/cmake/CreateMacDMG.cmake b/cmake/CreateMacDMG.cmake index 3c3770e4186..9f16535ff58 100644 --- a/cmake/CreateMacDMG.cmake +++ b/cmake/CreateMacDMG.cmake @@ -36,7 +36,4 @@ message(STATUS "Creating Mac DMG") file(REMOVE_RECURSE package) file(MAKE_DIRECTORY package) file(COPY staging/QGroundControl.app DESTINATION package) -file(REMOVE /tmp/tmp.dmg) -execute_process(COMMAND hdiutil create /tmp/tmp.dmg -ov -volname QGroundControl -fs APFS -srcfolder package) -execute_process(COMMAND hdiutil convert /tmp/tmp.dmg -format UDBZ -o package/QGroundControl.dmg) -file(REMOVE /tmp/tmp.dmg) +execute_process(COMMAND create-dmg --volname "QGroundControl Installer" "QGroundControl.dmg" "package/")