feat(ci): Define mac builder; Fix some mac scripts

Author: SersemPeca

.github/workflows/codetracer.yml

@@ -211,7 +211,7 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.R2_CODETRACER_BUCKET_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_CODETRACER_BUCKET_ACCESS_KEY }}
         run: |
-          aws --endpoint-url=${{ secrets.R2_CODETRACER_BUCKET_S3_ENDPOINT }} s3 cp CodeTracer.dmg s3://${{ vars.R2_CODETRACER_BUCKET_NAME }}/CodeTracer-${{ github.ref_name }}-arm64.dmg
+          aws --endpoint-url=${{ secrets.R2_CODETRACER_BUCKET_S3_ENDPOINT }} s3 cp ./non-nix-build/CodeTracer.dmg s3://${{ vars.R2_CODETRACER_BUCKET_NAME }}/CodeTracer-${{ github.ref_name }}-arm64.dmg
 
 
   test-rust:
@@ -220,6 +220,7 @@ jobs:
       - dev-build
       - nix-build
       - appimage-build
+      - dmg-build
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -7,6 +7,10 @@ nimcache/
 .venv/
 build-*/
 
+# Mac build
+*.app
+*.dmg
+
 # Direnv or shell hook + Nix Flake generated files
 .direnv/
 result

.gitmodules

@@ -70,4 +70,4 @@
 	url = https://github.com/cheatfate/nimcrypto.git
 [submodule "libs/zip"]
 	path = libs/zip
-	url = git@github.com:nim-lang/zip.git
+	url = https://github.com/nim-lang/zip.git

non-nix-build/build.sh

@@ -7,9 +7,9 @@ cd $NON_NIX_BUILD_DIR
 
 source env.sh
 
+
 echo "platform: ${platform}; os: ${os}"
 
-mkdir -p "$BIN_DIR" "$DEPS_DIR"
 
 # passing platform and os as args, not env var, to make it easier
 # to pass in nix-shell without modifying env
@@ -24,7 +24,7 @@ case $platform in
     ./build_mac_app.sh
     ./install_libraries.sh
     echo Successfully built non-nix-build/CodeTracer.app
-    ./buid_dmg.sh
+    ./build_dmg.sh
     echo Successfully built non-nix-build/CodeTracer.dmg
     ;;
    *)

non-nix-build/build_dmg.sh

@@ -1,13 +1,14 @@
 #!/usr/bin/env bash
 
+brew install create-dmg
+
 create-dmg \
   --volname "CodeTracer" \
   --background "dmg_background.png" \
   --window-pos 200 120 \
   --window-size 600 400 \
   --icon-size 100 \
   --icon "CodeTracer.app" 150 190 \
-  --hide-extensions "CodeTracer.app" \
   --app-drop-link 450 185 \
   "CodeTracer.dmg" \
   "CodeTracer.app"

non-nix-build/env.sh

@@ -32,6 +32,12 @@ export os
 : ${BIN_DIR:=$NON_NIX_BUILD_DIR/bin}
 : ${DEPS_DIR:=$NON_NIX_BUILD_DIR/deps}
 
+echo "BIN_DIR" "${BIN_DIR}"
+echo "DEPS_DIR" "${DEPS_DIR}"
+
+mkdir -p "$BIN_DIR"
+mkdir -p "$DEPS_DIR"
+
 export BIN_DIR
 export DEPS_DIR
 export DIST_DIR

non-nix-build/install_libraries.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-LIB_DIR="./CodeTracer.app/Contents/Frameworks"
+GIT_ROOT=$(git rev-parse --show-toplevel)
+
+LIB_DIR="${GIT_ROOT}/CodeTracer.app/Contents/Frameworks"
 
 mkdir -p "${LIB_DIR}"
 
@@ -12,3 +14,4 @@ cp "${HOMEBREW_LIB_DIR}/libzip.dylib" "${LIB_DIR}"
 
 install_name_tool -add_rpath "${LIB_DIR}" "${DIST_DIR}"/bin/ct
 install_name_tool -change /usr/lib/libzip.dylib @rpath/libzip.dylib "${DIST_DIR}"/bin/ct
+