Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-18 21:14:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
arm64v8a
2023-04-27 22:59:15 +09:00
parent 8b52d46a06
commit d5fed90ceb
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-qv2ray-cmake.yml vendored
View File

@@ -159,9 +159,10 @@ jobs:
path: download-artifact path: download-artifact
- name: Pack - name: Pack
run: | 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 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 . mv ghr*linux_amd64/ghr .
####
source libs/deploy_common.sh
find . -name artifacts.tgz | xargs -n1 tar xvzf find . -name artifacts.tgz | xargs -n1 tar xvzf
cd deployment cd deployment
cp -r public_res/* linux64 cp -r public_res/* linux64
@@ -179,7 +180,11 @@ jobs:
if: github.event.inputs.publish != 'y' if: github.event.inputs.publish != 'y'
run: | run: |
source libs/deploy_common.sh source libs/deploy_common.sh
find . -name artifacts.tgz | xargs -n1 tar xvzf
cd deployment 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 }} sudo bash ../libs/package_debian.sh ${{ github.event.inputs.tag }}
mv nekoray.deb $version_standalone-debian-x64.deb mv nekoray.deb $version_standalone-debian-x64.deb

2
db/ConfigBuilder.cpp
View File

@@ -9,7 +9,7 @@
#include <QFileInfo> #include <QFileInfo>
#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 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 { namespace NekoRay {