From 7255701084dda4acdd543d2bf64507401f74aa9d Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 18 Dec 2023 22:31:26 +0800
Subject: [PATCH] =?UTF-8?q?workflow=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/linux_mac_native.yml | 16 ++++++++--------
 .github/workflows/windows-native.yml   | 24 ++++++++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/linux_mac_native.yml b/.github/workflows/linux_mac_native.yml
index 605b8044..5bb4bb9c 100644
--- a/.github/workflows/linux_mac_native.yml
+++ b/.github/workflows/linux_mac_native.yml
@@ -73,15 +73,15 @@ jobs:
         mvn clean package --file pom.xml --no-transfer-progress
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
         chmod +x target/neutrino-proxy-client
-        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ env.VERSION }}
-        cp target/classes/app-copy.yml ./../app.yml
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-client)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-client-${{ env.VERSION }}'
-
-        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
     # 上传构建产物
     - name: Upload artifact
       uses: actions/upload-artifact@v3.0.0
@@ -91,7 +91,7 @@ jobs:
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
           neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
-          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
         # 保存时间，默认 90 天
         retention-days: 5
     # GitHub 上创建 release
@@ -102,7 +102,7 @@ jobs:
         files: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.zip
-          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
         prerelease: true
         token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/windows-native.yml b/.github/workflows/windows-native.yml
index 5b9da606..7ce4758c 100644
--- a/.github/workflows/windows-native.yml
+++ b/.github/workflows/windows-native.yml
@@ -57,26 +57,30 @@ jobs:
         mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
         cd neutrino-proxy-server
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
-        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server.exe
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-server)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-server.exe'
-        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.zip
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
     - name: Build with Maven (neutrino-proxy-client)
       run: |
         set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
         cd neutrino-proxy-client
         mvn clean package --file pom.xml --no-transfer-progress
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
-        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client.exe
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-client)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-client.exe'
-        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
     # 上传构建产物
     - name: Upload artifact
       uses: actions/upload-artifact@v3.0.0
@@ -85,8 +89,8 @@ jobs:
         path: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.zip
-          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
         # 保存时间，默认 90 天
         retention-days: 5
     # GitHub 上创建 release
@@ -97,7 +101,7 @@ jobs:
         files: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.zip
-          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
         prerelease: true
         token: ${{ secrets.GITHUB_TOKEN }}