From de1325c1910de3ee99f45f59b247c2ff2a0bb0b7 Mon Sep 17 00:00:00 2001
From: aandrew-me <aandrew.me@proton.me>
Date: Sat, 8 Jun 2024 19:34:40 +0300
Subject: [PATCH] Separate builds for mac x64 and arm and add arch info to
 filename

---
 .github/workflows/main.yml | 43 +++++++++++---------------------------
 README.md                  |  2 +-
 package.json               |  4 ++--
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 827582a..f50a6d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,7 +14,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         strategy:
             matrix:
-                os: [macos-latest, ubuntu-latest, windows-latest]
+                os: [macos-latest, macos-13, ubuntu-latest, windows-latest]
 
         steps:
             - name: Checkout code
@@ -36,13 +36,19 @@ jobs:
                 npx electron-builder -l --publish=always
                 npm run gh-linux
             
-            - name: Macos Build
+            - name: Macos Intel Build
+              if: matrix.os == 'macos-13'
+              run: |
+                curl https://github.com/aandrew-me/ffmpeg-builds/releases/download/v6/ffmpeg_mac_amd64 -o ffmpeg
+                chmod +x ffmpeg
+                npm i
+                npm run gh-mac
+            
+            - name: Macos Arm Build
               if: matrix.os == 'macos-latest'
               run: |
-                curl https://evermeet.cx/ffmpeg/ffmpeg-6.0.zip -o ffmpeg.zip
-                unzip ffmpeg.zip
+                curl https://github.com/aandrew-me/ffmpeg-builds/releases/download/v6/ffmpeg_mac_arm64 -o ffmpeg
                 chmod +x ffmpeg
-                rm ffmpeg.zip
                 npm i
                 npm run gh-mac
             
@@ -51,29 +57,4 @@ jobs:
               run: |
                 Invoke-WebRequest -Uri "https://github.com/aandrew-me/ffmpeg-builds/releases/download/v6/ffmpeg.exe" -OutFile ffmpeg.exe
                 npm i
-                npm run gh-windows
-
-            # - name: Upload Artifacts
-            #   id: upload-artifacts
-            #   uses: softprops/action-gh-release@v1
-            #   with:
-            #       files: |
-            #           tgpt-linux-amd64
-            #           tgpt-linux-i386
-            #           tgpt-linux-arm64
-            #           tgpt-amd64.exe
-            #           tgpt-i386.exe
-            #           tgpt-mac-amd64
-            #           tgpt-mac-arm64
-            #       token: ${{ secrets.GITHUB_TOKEN }}
-            #       draft: true
-            #       tag_name: v
-            #       name: tgpt
-
-#Windows
-                # Invoke-WebRequest -Uri "https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-n6.0-latest-win64-gpl-6.0.zip" -OutFile ffmpeg.zip
-                # Expand-Archive -Path ".\ffmpeg.zip" -DestinationPath ".\ffmpeg"
-                # pwd
-                # cp "D:\a\ytDownloader\ffmpeg\bin\ffmpeg.exe" .\ffmpeg.exe
-                # Remove-Item -Recurse -Force ffmpeg
-                # Remove-Item -Force ffmpeg.zip
\ No newline at end of file
+                npm run gh-windows
\ No newline at end of file
diff --git a/README.md b/README.md
index 41a7f70..5db655f 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ A modern GUI video and audio downloader supporting [hundreds of sites](https://g
 ## Linux 🐧
 
 Linux has several options available - Flatpak, AppImage, Snap and AUR.
-Flatpak is recommended.
+Flatpak is recommended. For arm processors, download from flathub.
 
 -   ### AppImage
 
diff --git a/package.json b/package.json
index 25dea56..b90e2cf 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 		"yt-dlp-wrap-plus": "^2.3.19"
 	},
 	"name": "ytdownloader",
-	"version": "3.18.0",
+	"version": "3.18.1",
 	"main": "main.js",
 	"scripts": {
 		"start": "electron .",
@@ -59,7 +59,7 @@
 				"zip",
 				"dmg"
 			],
-			"artifactName": "${productName}_Mac.${ext}"
+			"artifactName": "${productName}_Mac_${arch}.${ext}"
 		},
 		"dmg": {
 			"contents": [