diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index 4f22931..4a4b2fa 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -21,8 +21,6 @@ jobs: include: - cross_os: public_res cross_arch: public_res - - cross_os: windows7 - cross_arch: amd64 fail-fast: false runs-on: ubuntu-latest steps: @@ -41,11 +39,6 @@ jobs: uses: actions/setup-go@v5.0.2 with: go-version: '1.23.3' - - name: Install Older Golang - if: steps.cache-common.outputs.cache-hit != 'true' && matrix.cross_os == 'windows7' - uses: actions/setup-go@v5.0.2 - with: - go-version: '1.20' - name: Build golang parts if: steps.cache-common.outputs.cache-hit != 'true' shell: bash diff --git a/script/build_go.sh b/script/build_go.sh index a92906e..95f022d 100755 --- a/script/build_go.sh +++ b/script/build_go.sh @@ -9,10 +9,6 @@ source script/env_deploy.sh [ "$GOOS" == "linux" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/linux-arm64 || true [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "amd64" ] && DEST=$DEPLOYMENT/macos-amd64 || true [ "$GOOS" == "darwin" ] && [ "$GOARCH" == "arm64" ] && DEST=$DEPLOYMENT/macos-arm64 || true -if [ $GOOS = "windows7" ]; then - GOOS=windows - OLD=y -fi if [ -z $DEST ]; then echo "Please set GOOS GOARCH" @@ -30,9 +26,5 @@ popd #### Go: nekobox_core #### pushd core/cmd/nekobox_core -if [ -z $OLD ]; then - go build -v -o $DEST -trimpath -ldflags "-w -s -X $neko_common.Version_neko=$version_standalone" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp" -else - go build -v -o $DEST -trimpath -ldflags "-w -s -X $neko_common.Version_neko=$version_standalone" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_dhcp" -fi +go build -v -o $DEST -trimpath -ldflags "-w -s -X $neko_common.Version_neko=$version_standalone" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp" popd diff --git a/script/deploy_windows64.sh b/script/deploy_windows64.sh index 5af2972..c9d2c99 100755 --- a/script/deploy_windows64.sh +++ b/script/deploy_windows64.sh @@ -6,13 +6,8 @@ DEST=$DEPLOYMENT/windows64 rm -rf $DEST mkdir -p $DEST -DEST7=$DEPLOYMENT/windows7 -rm -rf $DEST7 -mkdir -p $DEST7 - #### copy exe #### cp $BUILD/nekoray.exe $DEST -cp $BUILD/nekoray.exe $DEST7 cd download-artifact cd *windows-amd64 @@ -22,12 +17,6 @@ cd *public_res tar xvzf artifacts.tgz -C ../../ cd ../.. -cd download-artifact -cd *windows7-amd64 -tar xvzf artifacts.tgz -C ../../ -cd ../.. - -cp $DEPLOYMENT/public_res/* $DEST7 mv $DEPLOYMENT/public_res/* $DEST #### deploy qt & DLL runtime #### @@ -35,8 +24,4 @@ pushd $DEST windeployqt nekoray.exe --no-translations --no-system-d3d-compiler --no-compiler-runtime --no-opengl-sw --verbose 2 popd -pushd $DEST7 -windeployqt nekoray.exe --no-translations --no-system-d3d-compiler --no-compiler-runtime --no-opengl-sw --verbose 2 -popd - -rm -rf $DEST/dxcompiler.dll $DEST/dxil.dll $DEST7/dxcompiler.dll $DEST7/dxil.dll \ No newline at end of file +rm -rf $DEST/dxcompiler.dll $DEST/dxil.dll \ No newline at end of file