Testing m1 compilation

Layendan · Mar 6, 2024 · 646c2f5 · 646c2f5
1 parent c428819
commit 646c2f5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,7 +12,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [macos-latest, windows-latest]
+        platform: ['macos-latest', 'macos-latest', 'windows-latest']
+        include:
+          - platform: 'macos-latest'
+            arch: 'x64'
+          - platform: 'macos-latest'
+            arch: 'arm64'
 
     runs-on: ${{ matrix.platform }}
     steps:
@@ -60,28 +65,40 @@ jobs:
           mv ffmpeg-git-*/ffmpeg src-tauri/bin/ffmpeg-x86_64-unknown-linux-gnu
 
       - name: Download FFmpeg (osx)
-        if: matrix.platform == 'macos-latest'
+        if: matrix.platform == 'macos-latest' && matrix.arch == 'x64'
         run: |
           curl -L https://evermeet.cx/ffmpeg/get/zip -o ffmpeg.zip
           unzip ffmpeg.zip -d src-tauri/bin/
           mv src-tauri/bin/ffmpeg src-tauri/bin/ffmpeg-x86_64-apple-darwin
 
+      - name: Download FFmpeg (m1)
+        if: matrix.platform == 'macos-latest' && matrix.arch == 'arm64'
+        run: |
+          curl -L https://evermeet.cx/ffmpeg/get/zip -o ffmpeg.zip
+          unzip ffmpeg.zip -d src-tauri/bin/
+          mv src-tauri/bin/ffmpeg src-tauri/bin/ffmpeg-aarch64-apple-darwin
+
       - name: Download FFmpeg (windows)
         if: matrix.platform == 'windows-latest'
         run: |
           curl -L https://www.gyan.dev/ffmpeg/builds/ffmpeg-git-full.7z -o ffmpeg.7z
           7z x ffmpeg.7z
           mv ffmpeg-*-git-*/bin/ffmpeg.exe src-tauri/bin/ffmpeg-x86_64-pc-windows-msvc.exe
 
+      - name: Set target flag
+        run: echo "TARGET_FLAG=$(if [ "${{ matrix.arch }}" = "arm64" ]; then echo "--target aarch64-apple-darwin"; else echo ""; fi)" >> $GITHUB_ENV
+
       - uses: tauri-apps/tauri-action@dev
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          TARGET_FLAG: ${{ env.TARGET_FLAG }}
         with:
           tagName: __VERSION__v
           releaseName: 'Layendanimator v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'
           releaseDraft: false
           prerelease: false
           updaterJsonPreferNsis: true
+          args: ${{ env.TARGET_FLAG }}
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
 	},
 	"package": {
 		"productName": "Layendanimator",
-		"version": "0.1.53"
+		"version": "0.1.54"
 	},
 	"tauri": {
 		"allowlist": {

diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json
@@ -8,7 +8,7 @@
 	},
 	"package": {
 		"productName": "Layendanimator",
-		"version": "0.1.53"
+		"version": "0.1.54"
 	},
 	"tauri": {
 		"allowlist": {

diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
@@ -8,7 +8,7 @@
     },
     "package": {
         "productName": "Layendanimator",
-        "version": "0.1.53"
+        "version": "0.1.54"
     },
     "tauri": {
         "allowlist": {