From d5fed90ceba78fd282bee3b79f4305661b2deb6c Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Thu, 27 Apr 2023 22:59:15 +0900 Subject: [PATCH] fix --- .github/workflows/build-qv2ray-cmake.yml | 7 ++++++- db/ConfigBuilder.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index 18455c8..56fff80 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -159,9 +159,10 @@ jobs: path: download-artifact - name: Pack run: | - source libs/deploy_common.sh curl -Lo - https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz | tar xzv mv ghr*linux_amd64/ghr . + #### + source libs/deploy_common.sh find . -name artifacts.tgz | xargs -n1 tar xvzf cd deployment cp -r public_res/* linux64 @@ -179,7 +180,11 @@ jobs: if: github.event.inputs.publish != 'y' run: | source libs/deploy_common.sh + find . -name artifacts.tgz | xargs -n1 tar xvzf cd deployment + cp -r public_res/* linux64 + cp -r public_res/* windows64 + rm -rf public_res *.pdb #### sudo bash ../libs/package_debian.sh ${{ github.event.inputs.tag }} mv nekoray.deb $version_standalone-debian-x64.deb diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp index 57941a0..035c6fd 100644 --- a/db/ConfigBuilder.cpp +++ b/db/ConfigBuilder.cpp @@ -9,7 +9,7 @@ #include #define BOX_UNDERLYING_DNS NekoRay::dataStore->core_box_underlying_dns.isEmpty() ? "underlying://0.0.0.0" : NekoRay::dataStore->core_box_underlying_dns -#define BOX_UNDERLYING_DNS_EXPORT NekoRay::dataStore->core_box_underlying_dns.isEmpty() ? "local" : NekoRay::dataStore->core_box_underlying_dns +#define BOX_UNDERLYING_DNS_EXPORT NekoRay::dataStore->core_box_underlying_dns.isEmpty() ? (status->forExport ? "local" : "underlying://0.0.0.0") : NekoRay::dataStore->core_box_underlying_dns namespace NekoRay {