From c339c7b4790b4e110c3dfc98712668d69bbce218 Mon Sep 17 00:00:00 2001
From: Jakub Panek <me@panekj.dev>
Date: Tue, 4 Jun 2024 19:55:29 +0200
Subject: [PATCH] Update release-test-macos.yml

---
 .github/workflows/release-test-macos.yml | 34 +++++++++++++-----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release-test-macos.yml b/.github/workflows/release-test-macos.yml
index 1080f17f3d..88385e2fdd 100644
--- a/.github/workflows/release-test-macos.yml
+++ b/.github/workflows/release-test-macos.yml
@@ -19,13 +19,21 @@ jobs:
     strategy:
       matrix:
         include:
+          # - rust-arch: aarch64
+          #   darwin-arch: arm64
+          #   runs-on: macos-14
+
+          # - rust-arch: x86_64
+          #   darwin-arch: x86_64
+          #   runs-on: macos-13
+
           - rust-arch: aarch64
-            darwin-arch: arm64
-            runs-on: macos-14
+            darwin-arch: x86_64
+            runs-on: macos-12
 
-          - rust-arch: x86_64
+          - rust-arch: aarch64
             darwin-arch: x86_64
-            runs-on: macos-13
+            runs-on: macos-11
     env:
       RELEASE_TAG_NAME: ${{ needs.tagname.outputs.tag_name }}
 
@@ -35,12 +43,12 @@ jobs:
       APP_NAME: Lapce-macos-${{ matrix.rust-arch }}.app
       DMG_NAME: lapce-macos-${{ matrix.rust-arch }}.dmg
 
-      # CARGO_BUILD_TARGET: ${{ matrix.rust-arch }}-apple-darwin
+      CARGO_BUILD_TARGET: ${{ matrix.rust-arch }}-apple-darwin
     steps:
       - uses: actions/checkout@v4
 
       - name: Update rust
-        run: rustup update
+        run: rustup update && rustup target add ${{ env.CARGO_BUILD_TARGET }}
 
       - name: Import Certificate
         uses: Apple-Actions/import-codesign-certs@v3
@@ -51,21 +59,17 @@ jobs:
       - name: Fetch dependencies
         run: cargo fetch --locked
 
-      - name: arm64
-        if: matrix.rust-arch == 'aarch64'
-        run: echo 'MACOSX_DEPLOYMENT_TARGET=11.0' >> $GITHUB_ENV
-
       - name: Make DMG
         run: make dmg
 
       - name: Rename
         run: |
-          cp ./target/release-lto/macos/Lapce.dmg ./target/release-lto/macos/${{ env.DMG_NAME }}
+          cp ./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/Lapce.dmg ./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}
 
       - name: Notarize Release Build
         uses: lando/notarize-action@v2
         with:
-          product-path: "./target/release-lto/macos/${{ env.DMG_NAME }}"
+          product-path: "./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}"
           appstore-connect-username: ${{ secrets.NOTARIZE_USERNAME }}
           appstore-connect-password: ${{ secrets.NOTARIZE_PASSWORD }}
           appstore-connect-team-id: CYSGAZFR8D
@@ -74,11 +78,11 @@ jobs:
       - name: "Staple Release Build"
         uses: lapce/xcode-staple@062485d6eeafe841c18a412f012e80f49e23c517
         with:
-          product-path: "./target/release-lto/macos/${{ env.DMG_NAME }}"
+          product-path: "./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}"
 
       - uses: actions/upload-artifact@v4
         with:
-          name: lapce-macos-${{ matrix.rust-arch }}
+          name: lapce-macos-${{ matrix.runs-on }}
           path: |
-            ./target/release-lto/macos/${{ env.DMG_NAME }}
+            ./target/${{ env.CARGO_BUILD_TARGET }}/release-lto/macos/${{ env.DMG_NAME }}
           retention-days: 1