Update On Thu Dec 26 19:33:33 CET 2024

v2rayn/.github/workflows/build-linux.yml

@@ -7,9 +7,14 @@ on:
         required: false
         type: string
   push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches:
+      - master
+
+env:
+  OutputArch: "linux-64"
+  OutputArchArm: "linux-arm64"
+  OutputPath64:  "${{ github.workspace }}/v2rayN/Release/linux-64"
+  OutputPathArm64:  "${{ github.workspace }}/v2rayN/Release/linux-arm64"
 
 jobs:
   build:
@@ -26,9 +31,6 @@ jobs:
     - name: Build
       run: |
         cd v2rayN 
-        OutputPath='./bin/v2rayN'
-        OutputPath64="${OutputPath}/linux-x64"
-        OutputPathArm64="${OutputPath}/linux-arm64"
         dotnet publish 	./v2rayN.Desktop/v2rayN.Desktop.csproj 	-c Release 	-r linux-x64 	--self-contained true 	-p:PublishReadyToRun=false 	-p:PublishSingleFile=true 	-o $OutputPath64
         dotnet publish 	./v2rayN.Desktop/v2rayN.Desktop.csproj 	-c Release 	-r linux-arm64 	--self-contained true 	-p:PublishReadyToRun=false 	-p:PublishSingleFile=true 	-o $OutputPathArm64
 
@@ -37,29 +39,36 @@ jobs:
       with:
         name: v2rayN-linux
         path: |
-          ./v2rayN/bin/v2rayN
+          ${{ github.workspace }}/v2rayN/Release/linux*
 
+    # release debian package
     - name: Package debian 
       if: github.event.inputs.release_tag != ''
       run: |
-        cd v2rayN 
         chmod 755 package-debian.sh
-        ./package-debian.sh ${{ github.event.inputs.release_tag }} x64
-        ./package-debian.sh ${{ github.event.inputs.release_tag }} arm64
+        ./package-debian.sh $OutputArch $OutputPath64 ${{ github.event.inputs.release_tag }} 
+        ./package-debian.sh $OutputArchArm $OutputPathArm64 ${{ github.event.inputs.release_tag }} 
 
-    - name: Upload Package artifacts
-      uses: actions/upload-artifact@v4 
-      if: github.event.inputs.release_tag != ''
-      with:
-        name: v2rayN-linux-Package
-        path: |
-           ${{ github.workspace }}/v2rayN/v2rayN*.deb
-
-    - name: Upload to release
+    - name: Upload deb to release
       uses: svenstaro/upload-release-action@v2
       if: github.event.inputs.release_tag != ''
       with:
-        file: ${{ github.workspace }}/v2rayN/v2rayN*.deb
+        file: ${{ github.workspace }}/v2rayN*.deb
         tag: ${{ github.event.inputs.release_tag }}
         file_glob: true
-        prerelease: true
+    
+    # release zip archive
+    - name: Package release zip archive
+      if: github.event.inputs.release_tag != ''
+      run: | 
+        chmod 755 package-release-zip.sh
+        ./package-release-zip.sh $OutputArch $OutputPath64
+        ./package-release-zip.sh $OutputArchArm $OutputPathArm64
+    
+    - name: Upload zip archive to release
+      uses: svenstaro/upload-release-action@v2
+      if: github.event.inputs.release_tag != ''
+      with:
+        file: ${{ github.workspace }}/v2rayN*.zip
+        tag: ${{ github.event.inputs.release_tag }}
+        file_glob: true