diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index 52319ad..c8137cb 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -171,7 +171,7 @@ jobs: 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 + source libs/env_deploy.sh find . -name artifacts.tgz | xargs -n1 tar xvzf cd deployment cp -r public_res/* linux64 @@ -195,7 +195,7 @@ jobs: - name: Pack Debian if: github.event.inputs.publish != 'y' run: | - source libs/deploy_common.sh + source libs/env_deploy.sh find . -name artifacts.tgz | xargs -n1 tar xvzf cd deployment cp -r public_res/* linux64 @@ -205,7 +205,7 @@ jobs: sudo rm -rf nekoray - name: Pack AppImage run: | - source libs/deploy_common.sh + source libs/env_deploy.sh find . -name artifacts.tgz | xargs -n1 tar xvzf cd deployment cp -r public_res/* linux64 diff --git a/libs/build_public_res.sh b/libs/build_public_res.sh index 26edc0d..0fdbf19 100755 --- a/libs/build_public_res.sh +++ b/libs/build_public_res.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/deploy_common.sh +source libs/env_deploy.sh DEST=$DEPLOYMENT/public_res rm -rf $DEST mkdir -p $DEST diff --git a/libs/deploy_linux64.sh b/libs/deploy_linux64.sh index 6316178..cf9cf8b 100755 --- a/libs/deploy_linux64.sh +++ b/libs/deploy_linux64.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/deploy_common.sh +source libs/env_deploy.sh DEST=$DEPLOYMENT/linux64 rm -rf $DEST mkdir -p $DEST diff --git a/libs/deploy_macos.sh b/libs/deploy_macos.sh index 7a45f3d..7e9febf 100755 --- a/libs/deploy_macos.sh +++ b/libs/deploy_macos.sh @@ -7,7 +7,7 @@ else ARCH="amd64" fi -source libs/deploy_common.sh +source libs/env_deploy.sh DEST=$DEPLOYMENT/macos-$ARCH rm -rf $DEST mkdir -p $DEST diff --git a/libs/deploy_windows64.sh b/libs/deploy_windows64.sh index b532d02..403b899 100755 --- a/libs/deploy_windows64.sh +++ b/libs/deploy_windows64.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/deploy_common.sh +source libs/env_deploy.sh if [ "$DL_QT_VER" == "5.15" ]; then DEST=$DEPLOYMENT/windows7-x64 else @@ -20,8 +20,8 @@ rm -rf translations rm -rf libEGL.dll libGLESv2.dll Qt6Pdf.dll if [ "$DL_QT_VER" != "5.15" ]; then - curl -fLSO https://github.com/MatsuriDayo/nekoray_qt_runtime/releases/download/20220503/libcrypto-3-x64.dll - curl -fLSO https://github.com/MatsuriDayo/nekoray_qt_runtime/releases/download/20220503/libssl-3-x64.dll + cp $SRC_ROOT/qtsdk/Qt/bin/libcrypto-3-x64.dll . + cp $SRC_ROOT/qtsdk/Qt/bin/libssl-3-x64.dll . fi popd diff --git a/libs/download_qtsdk_win.sh b/libs/download_qtsdk_win.sh index 989579b..690fdec 100644 --- a/libs/download_qtsdk_win.sh +++ b/libs/download_qtsdk_win.sh @@ -3,7 +3,7 @@ cd qtsdk if [ "$DL_QT_VER" == "5.15" ]; then curl -LSO https://github.com/MatsuriDayo/nekoray_qt_runtime/releases/download/20220503/Qt5.15.7-Windows-x86_64-VS2019-16.11.20-20221103.7z else - curl -LSO https://github.com/MatsuriDayo/nekoray_qt_runtime/releases/download/20220503/Qt6.5.1-Windows-x86_64-VS2022-17.6.2-20230601.7z + curl -LSO https://github.com/MatsuriDayo/nekoray_qt_runtime/releases/download/20220503/Qt6.5.2-Windows-x86_64-VS2022-17.6.5-20230803.7z fi 7z x *.7z rm *.7z diff --git a/libs/deploy_common.sh b/libs/env_deploy.sh similarity index 90% rename from libs/deploy_common.sh rename to libs/env_deploy.sh index 68368a6..5c174ff 100644 --- a/libs/deploy_common.sh +++ b/libs/env_deploy.sh @@ -1,4 +1,3 @@ -#### env #### SRC_ROOT="$PWD" DEPLOYMENT="$SRC_ROOT/deployment" BUILD="$SRC_ROOT/build" diff --git a/libs/get_source.sh b/libs/get_source.sh index c7d42b7..7d302dd 100755 --- a/libs/get_source.sh +++ b/libs/get_source.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -source libs/deploy_common.sh +source libs/env_deploy.sh ENV_NEKORAY=1 source libs/get_source_env.sh pushd ..