From c78b733850dfe57580da12671312e2229cbab07e Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Mon, 23 Dec 2024 13:59:55 +0800 Subject: [PATCH] Revert "update build macos" This reverts commit a57c83125e152f66421a9c71a97996812a1e650b. --- .github/workflows/build-osx.yml | 11 +++-------- v2rayN/build-osx.sh | 15 +++++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml index 53b86420..b626a510 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -25,13 +25,8 @@ jobs: - name: Upload build artifacts uses: actions/upload-artifact@v4 with: - name: v2rayN-macos-64 + name: v2rayN-osx path: | - ./v2rayN/v2rayN-macos-64.zip + ./v2rayN/v2rayN-osx.zip - - 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 + \ No newline at end of file diff --git a/v2rayN/build-osx.sh b/v2rayN/build-osx.sh index 40e2b078..4ed79598 100755 --- a/v2rayN/build-osx.sh +++ b/v2rayN/build-osx.sh @@ -2,17 +2,16 @@ echo 'Building' -OutputPath='./bin/v2rayN/osx-x64' -OutputPathArm64='./bin/v2rayN/osx-arm64' +OutputPath='./bin/v2rayN' -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 +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" -rm -rf "$OutputPath/*.pdb" -rm -rf "$OutputPathArm64/*.pdb" +rm -rf "$OutputPath/osx-x64/*.pdb" +rm -rf "$OutputPath/osx-arm64/*.pdb" echo 'Build done' -7z a v2rayN-macos-64.zip $OutputPath -7z a v2rayN-macos-arm64.zip $OutputPathArm64 +ls $OutputPath +7z a v2rayN-osx.zip $OutputPath exit 0