summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Honz <exislow+github@gmail.com>2025-07-03 23:45:21 +0200
committerRobert Honz <exislow+github@gmail.com>2025-07-03 23:45:21 +0200
commitae17fab0574f5f9b5a625a61fe13c6a9c917d9af (patch)
tree2d191b00a96795d8aace7cb81cacd270d7d5f53f
parent0e7dda562219ce656f67d2a70a7bd5af6d89f335 (diff)
downloadtidal-dl-ng-ae17fab0574f5f9b5a625a61fe13c6a9c917d9af.tar.gz
chore(workflow): 🚀 Update GUI packaging process for macOS
* Added a sleep command before creating the `.dmg` file to ensure proper execution. * Modified the `hdiutil create` command to include `-debug` for troubleshooting.
-rw-r--r--.github/workflows/release-or-test-build.yml96
-rw-r--r--Makefile3
2 files changed, 50 insertions, 49 deletions
diff --git a/.github/workflows/release-or-test-build.yml b/.github/workflows/release-or-test-build.yml
index d11cfc8..cfa8784 100644
--- a/.github/workflows/release-or-test-build.yml
+++ b/.github/workflows/release-or-test-build.yml
@@ -107,54 +107,54 @@ jobs:
cd dist &&
zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
cd ..
- - os: "macos-14"
- TARGET: "macos-14 M1"
- OS_ARCH: ${{needs.compute.outputs.ARCH_MACOS_ARM64}}
- CMD_BUILD: >
- brew install create-dmg &&
- source $VENV &&
- poetry run make gui-macos-dmg APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd dist &&
- zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_ARM64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
- cd ..
- - os: "ubuntu-24.04"
- TARGET: "ubuntu-22.04"
- OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_X64}}
- CMD_BUILD: >
- source $VENV &&
- poetry run make gui-linux APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd dist &&
- zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd ..
- - os: "ubuntu-24.04-arm"
- TARGET: "ubuntu-22.04-arm"
- OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_ARM64}}
- CMD_BUILD: >
- source $VENV &&
- poetry run make gui-linux APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd dist &&
- zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_ARM64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd ..
- - os: "windows-2022"
- TARGET: "windows-2022"
- OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_X64}}
- CMD_BUILD: >
- choco install zip make -y &&
- source $VENV &&
- poetry run make gui-windows APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd dist &&
- zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd ..
- - os: "windows-11-arm"
- TARGET: "windows-11-arm"
- OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_ARM64}}
- CMD_BUILD: >
- choco install zip make -y &&
- source $VENV &&
- poetry run make gui-windows APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd dist &&
- zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_ARM64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
- cd ..
+ # - os: "macos-14"
+ # TARGET: "macos-14 M1"
+ # OS_ARCH: ${{needs.compute.outputs.ARCH_MACOS_ARM64}}
+ # CMD_BUILD: >
+ # brew install create-dmg &&
+ # source $VENV &&
+ # poetry run make gui-macos-dmg APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd dist &&
+ # zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_ARM64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
+ # cd ..
+ # - os: "ubuntu-24.04"
+ # TARGET: "ubuntu-22.04"
+ # OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_X64}}
+ # CMD_BUILD: >
+ # source $VENV &&
+ # poetry run make gui-linux APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd dist &&
+ # zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd ..
+ # - os: "ubuntu-24.04-arm"
+ # TARGET: "ubuntu-22.04-arm"
+ # OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_ARM64}}
+ # CMD_BUILD: >
+ # source $VENV &&
+ # poetry run make gui-linux APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd dist &&
+ # zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_ARM64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd ..
+ # - os: "windows-2022"
+ # TARGET: "windows-2022"
+ # OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_X64}}
+ # CMD_BUILD: >
+ # choco install zip make -y &&
+ # source $VENV &&
+ # poetry run make gui-windows APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd dist &&
+ # zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd ..
+ # - os: "windows-11-arm"
+ # TARGET: "windows-11-arm"
+ # OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_ARM64}}
+ # CMD_BUILD: >
+ # choco install zip make -y &&
+ # source $VENV &&
+ # poetry run make gui-windows APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd dist &&
+ # zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_ARM64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
+ # cd ..
runs-on: ${{ matrix.os }}
steps:
- name: Check out
diff --git a/Makefile b/Makefile
index d61624b..07fc9b0 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,8 @@ gui-macos-dmg: gui ## Package GUI in a *.dmg file
gui-macos-dmg-intel: gui ## Package GUI in a *.dmg file; Workaround for Intel Macs, since Apple Script permissions are not set correctly on GitHub Actiion Runner images
@poetry run mkdir -p $(app_path_dist)/dmg
@poetry run mv "$(app_path_dist)/$(APP_BUNDLE_NAME).app" "$(app_path_dist)/$(DMG_NAME)/$(APP_NAME).app"
- @poetry run hdiutil create -volname "$(APP_NAME)" \
+ @poetry run sleep 60
+ @poetry run /usr/bin/sudo hdiutil create -debug -volname "$(APP_NAME)" \
-srcfolder "$(app_path_dist)/$(DMG_NAME)/" \
-ov -format UDZO \
-fs APFS \