From a57c83125e152f66421a9c71a97996812a1e650b Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 23 Dec 2024 12:12:03 +0800
Subject: [PATCH] update build macos
---
.github/workflows/build-osx.yml | 11 ++++++++---
v2rayN/build-osx.sh | 15 ++++++++-------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml
index b626a510..53b86420 100644
--- a/.github/workflows/build-osx.yml
+++ b/.github/workflows/build-osx.yml
@@ -25,8 +25,13 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v4
with:
- name: v2rayN-osx
+ name: v2rayN-macos-64
path: |
- ./v2rayN/v2rayN-osx.zip
+ ./v2rayN/v2rayN-macos-64.zip
-
\ No newline at end of file
+ - name: Upload build artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: v2rayN-macos-arm64
+ path: |
+ ./v2rayN/v2rayN-macos-arm64.zip
\ No newline at end of file
diff --git a/v2rayN/build-osx.sh b/v2rayN/build-osx.sh
index 4ed79598..40e2b078 100755
--- a/v2rayN/build-osx.sh
+++ b/v2rayN/build-osx.sh
@@ -2,16 +2,17 @@
echo 'Building'
-OutputPath='./bin/v2rayN'
+OutputPath='./bin/v2rayN/osx-x64'
+OutputPathArm64='./bin/v2rayN/osx-arm64'
-dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o "${OutputPath}/osx-x64"
-dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o "${OutputPath}/osx-arm64"
+dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-x64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPath
+dotnet publish ./v2rayN.Desktop/v2rayN.Desktop.csproj -c Release -r osx-arm64 --self-contained true -p:PublishReadyToRun=false -p:PublishSingleFile=true -o $OutputPathArm64
-rm -rf "$OutputPath/osx-x64/*.pdb"
-rm -rf "$OutputPath/osx-arm64/*.pdb"
+rm -rf "$OutputPath/*.pdb"
+rm -rf "$OutputPathArm64/*.pdb"
echo 'Build done'
-ls $OutputPath
-7z a v2rayN-osx.zip $OutputPath
+7z a v2rayN-macos-64.zip $OutputPath
+7z a v2rayN-macos-arm64.zip $OutputPathArm64
exit 0