From 09f934bdd0a6b0f24b3d7252a753163da40202f0 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Thu, 2 Nov 2023 17:32:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=93=E5=8C=85=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/linux_mac_native.yml | 4 +++- scripts/unix/client_build.sh | 2 +- scripts/unix/client_native_build.sh | 4 ++-- scripts/unix/server_build.sh | 2 +- scripts/unix/server_native_build.sh | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux_mac_native.yml b/.github/workflows/linux_mac_native.yml index 6e743305..d8dd5ae5 100644 --- a/.github/workflows/linux_mac_native.yml +++ b/.github/workflows/linux_mac_native.yml @@ -48,10 +48,11 @@ jobs: - name: Build with Maven (neutrino-proxy-server) run: | mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress - cd neutrino-proxy-server + cd neutrino-proxy-server mvn clean native:compile -P native --file pom.xml --no-transfer-progress chmod +x target/neutrino-proxy-server cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ github.ref_name }} + cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ github.ref_name }}/app.yml - name: Archive zip (neutrino-proxy-server) uses: thedoctor0/zip-release@master with: @@ -65,6 +66,7 @@ jobs: 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-${{ github.ref_name }} + cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ github.ref_name }}/app.yml - name: Archive zip (neutrino-proxy-client) uses: thedoctor0/zip-release@master with: diff --git a/scripts/unix/client_build.sh b/scripts/unix/client_build.sh index 988250ad..868e38ac 100644 --- a/scripts/unix/client_build.sh +++ b/scripts/unix/client_build.sh @@ -25,6 +25,6 @@ cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neu cd $clientDeployDir mkdir neutrino-proxy-client-jar cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar -cp ../../neutrino-proxy-client/src/main/resources/app.yml ./neutrino-proxy-client-jar/app.yml +cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-jar/app.yml zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar rm -rf $clientDeployDir/neutrino-proxy-client-jar diff --git a/scripts/unix/client_native_build.sh b/scripts/unix/client_native_build.sh index d3160c6f..4041c228 100644 --- a/scripts/unix/client_native_build.sh +++ b/scripts/unix/client_native_build.sh @@ -40,13 +40,13 @@ cd $clientDeployDir ## jar mkdir neutrino-proxy-client-jar cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar -cp ../../neutrino-proxy-client/src/main/resources/app.yml ./neutrino-proxy-client-jar/app.yml +cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-jar/app.yml zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar rm -rf ./neutrino-proxy-client-jar ## native mkdir neutrino-proxy-client-${machine}-native cp ../../neutrino-proxy-client/target/neutrino-proxy-client ./neutrino-proxy-client-${machine}-native/neutrino-proxy-client -cp ../../neutrino-proxy-client/src/main/resources/app.yml ./neutrino-proxy-client-${machine}-native/app.yml +cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-${machine}-native/app.yml zip -r neutrino-proxy-client-${machine}-native.zip ./neutrino-proxy-client-${machine}-native rm -rf ./neutrino-proxy-client-${machine}-native diff --git a/scripts/unix/server_build.sh b/scripts/unix/server_build.sh index 8d5029a1..bc817d51 100644 --- a/scripts/unix/server_build.sh +++ b/scripts/unix/server_build.sh @@ -25,6 +25,6 @@ cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neu cd $serverDeployDir mkdir neutrino-proxy-server-jar cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar -cp ../../neutrino-proxy-server/src/main/resources/app.yml ./neutrino-proxy-server-jar/app.yml +cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-jar/app.yml zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar rm -rf $serverDeployDir/neutrino-proxy-server-jar diff --git a/scripts/unix/server_native_build.sh b/scripts/unix/server_native_build.sh index 70ea546b..919da907 100644 --- a/scripts/unix/server_native_build.sh +++ b/scripts/unix/server_native_build.sh @@ -49,13 +49,13 @@ cd $serverDeployDir ## jar mkdir neutrino-proxy-server-jar cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar -cp ../../neutrino-proxy-server/src/main/resources/app.yml ./neutrino-proxy-server-jar/app.yml +cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-jar/app.yml zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar rm -rf ./neutrino-proxy-server-jar ## native mkdir neutrino-proxy-server-${machine}-native cp ../../neutrino-proxy-server/target/neutrino-proxy-server ./neutrino-proxy-server-${machine}-native/neutrino-proxy-server -cp ../../neutrino-proxy-server/src/main/resources/app.yml ./neutrino-proxy-server-${machine}-native/app.yml +cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-${machine}-native/app.yml zip -r neutrino-proxy-server-${machine}-native.zip ./neutrino-proxy-server-${machine}-native rm -rf ./neutrino-proxy-server-${machine}-native