From c72f9b16db413b6e958c6ac13fb8109cc90db325 Mon Sep 17 00:00:00 2001
From: Jakub Panek <me@panekj.dev>
Date: Tue, 4 Jun 2024 20:24:38 +0200
Subject: [PATCH] fix release dir

---
 .github/workflows/release-test-macos.yml | 12 +++++++-----
 Makefile                                 |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release-test-macos.yml b/.github/workflows/release-test-macos.yml
index 88385e2fdd..ac28576d41 100644
--- a/.github/workflows/release-test-macos.yml
+++ b/.github/workflows/release-test-macos.yml
@@ -35,7 +35,7 @@ jobs:
             darwin-arch: x86_64
             runs-on: macos-11
     env:
-      RELEASE_TAG_NAME: ${{ needs.tagname.outputs.tag_name }}
+      RELEASE_TAG_NAME: nightly
 
       NOTARIZE_USERNAME: ${{ secrets.NOTARIZE_USERNAME }}
       NOTARIZE_PASSWORD: ${{ secrets.NOTARIZE_PASSWORD }}
@@ -43,6 +43,8 @@ jobs:
       APP_NAME: Lapce-macos-${{ matrix.rust-arch }}.app
       DMG_NAME: lapce-macos-${{ matrix.rust-arch }}.dmg
 
+      RELEASE_DIR: ./target/${{ matrix.rust-arch }}-apple-darwin/release-lto
+
       CARGO_BUILD_TARGET: ${{ matrix.rust-arch }}-apple-darwin
     steps:
       - uses: actions/checkout@v4
@@ -64,12 +66,12 @@ jobs:
 
       - name: Rename
         run: |
-          cp ./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/Lapce.dmg ./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}
+          cp ${{ env.RELEASE_DIR }}/macos/Lapce.dmg ${{ env.RELEASE_DIR }}/macos/${{ env.DMG_NAME }}
 
       - name: Notarize Release Build
         uses: lando/notarize-action@v2
         with:
-          product-path: "./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}"
+          product-path: "${{ env.RELEASE_DIR }}/macos/${{ env.DMG_NAME }}"
           appstore-connect-username: ${{ secrets.NOTARIZE_USERNAME }}
           appstore-connect-password: ${{ secrets.NOTARIZE_PASSWORD }}
           appstore-connect-team-id: CYSGAZFR8D
@@ -78,11 +80,11 @@ jobs:
       - name: "Staple Release Build"
         uses: lapce/xcode-staple@062485d6eeafe841c18a412f012e80f49e23c517
         with:
-          product-path: "./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}"
+          product-path: "${{ env.RELEASE_DIR }}/macos/${{ env.DMG_NAME }}"
 
       - uses: actions/upload-artifact@v4
         with:
           name: lapce-macos-${{ matrix.runs-on }}
           path: |
-            ./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}
+            ${{ env.RELEASE_DIR }}/macos/${{ env.DMG_NAME }}
           retention-days: 1
diff --git a/Makefile b/Makefile
index 2fec707a2e..78e66e8ea1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ TARGET = lapce
 CODESIGN_IDENTITY = FAC8FBEA99169DC1980731029648F110628D6A32
 
 ASSETS_DIR = extra
-RELEASE_DIR = target/release-lto
+RELEASE_DIR ?= target/release-lto
 
 MACOSX_DEPLOYMENT_TARGET ?= 10.11