From 5d888b64bff8a536c641e0960f14db5f92e8c30f Mon Sep 17 00:00:00 2001
From: scosman <scosman@users.noreply.github.com>
Date: Sat, 1 Mar 2025 18:03:14 -0500
Subject: [PATCH] Another fix for MacOS checksums. Checksum before deleting the
 dir, and move the tar process into github action

---
 .github/workflows/build_desktop.yml | 13 +++++++++++--
 app/desktop/build_desktop_app.sh    |  9 ---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_desktop.yml b/.github/workflows/build_desktop.yml
index 1518dc6e..e3add70f 100644
--- a/.github/workflows/build_desktop.yml
+++ b/.github/workflows/build_desktop.yml
@@ -39,7 +39,7 @@ jobs:
 
       # Compress MacOS app param ignored on other platforms
       - name: Build Desktop App
-        run: uv run bash ./app/desktop/build_desktop_app.sh --compress-mac-app
+        run: uv run bash ./app/desktop/build_desktop_app.sh
 
       - name: Build Windows Installer
         if: matrix.os == 'windows-latest'
@@ -55,7 +55,7 @@ jobs:
 
       - name: Checksums (macOS)
         if: runner.os == 'macOS'
-        run: find ./app/desktop/build/dist/Kiln.app ! -iname "./app/desktop/build/dist/Kiln.app/Contents/Resources/botocore/data/*" -type f -exec md5 {} \;
+        run: find ./app/desktop/build/dist/Kiln.app -type f -not -path "*/Contents/Resources/botocore/data/*" -exec md5 {} \;
 
       - name: Checksums (Linux)
         if: runner.os == 'Linux'
@@ -67,6 +67,15 @@ jobs:
           certutil -hashfile ./app/desktop/build/dist/Kiln.Windows.Installer.exe SHA256
           certutil -hashfile ./app/desktop/build/dist/Kiln/Kiln.exe SHA256
 
+      # MacOS apps have symlinks, and GitHub artifact upload zip will break them. Tar instead.
+      - name: Compress MacOS App
+        if: runner.os == 'macOS'
+        working-directory: ./app/desktop/build/dist
+        run: |
+          echo "Compressing MacOS app"
+          tar czpvf Kiln.app.tgz Kiln.app
+          rm -r Kiln.app
+
       - name: Upload Build
         uses: actions/upload-artifact@v4
         with:
diff --git a/app/desktop/build_desktop_app.sh b/app/desktop/build_desktop_app.sh
index c9506147..1b79995e 100755
--- a/app/desktop/build_desktop_app.sh
+++ b/app/desktop/build_desktop_app.sh
@@ -68,12 +68,3 @@ pyinstaller $(printf %s "$PLATFORM_OPTS")  \
   --noconfirm --distpath=./desktop/build/dist --workpath=./desktop/build/work \
   -n Kiln --specpath=./desktop/build \
   --paths=. ./desktop/desktop.py
-
-# MacOS apps have symlinks, and GitHub artifact upload zip will break them. Tar instead.
-if [[ $* == *--compress-mac-app* && "$(uname)" == "Darwin" ]]; then
-  echo "Compressing MacOS app"
-  cd ./desktop/build/dist
-  tar czpvf Kiln.app.tgz Kiln.app
-  rm -r Kiln.app
-  cd ../../..
-fi