diff --git a/.github/workflows/build-nekoray-cmake.yml b/.github/workflows/build-nekoray-cmake.yml index 1a34385..0c1fba4 100644 --- a/.github/workflows/build-nekoray-cmake.yml +++ b/.github/workflows/build-nekoray-cmake.yml @@ -4,20 +4,20 @@ on: workflow_dispatch: inputs: tag: - description: 'Release Tag' + description: "Release Tag" required: true publish: - description: 'Publish: If want ignore' + description: "Publish: If want ignore" required: false artifact-pack: - description: 'artifact-pack: If want ignore' + description: "artifact-pack: If want ignore" required: false jobs: build-go: strategy: matrix: - cross_os: [ windows, linux ] - cross_arch: [ amd64 ] + cross_os: [windows, linux] + cross_arch: [amd64] include: - cross_os: public_res cross_arch: public_res @@ -38,7 +38,7 @@ jobs: if: steps.cache-common.outputs.cache-hit != 'true' uses: actions/setup-go@v3 with: - go-version: ^1.21 + go-version: ^1.22 - name: Build golang parts if: steps.cache-common.outputs.cache-hit != 'true' shell: bash @@ -61,7 +61,7 @@ jobs: include: - platform: windows-2022 arch: x64 - qt_version: "6.5" + qt_version: "6.7" - platform: ubuntu-20.04 arch: x64 qt_version: "5.12" diff --git a/go/grpc_server/update.go b/go/grpc_server/update.go index f3acfa6..2e7224e 100644 --- a/go/grpc_server/update.go +++ b/go/grpc_server/update.go @@ -53,10 +53,6 @@ func (s *BaseServer) Update(ctx context.Context, in *gen.UpdateReq) (*gen.Update var search string if runtime.GOOS == "windows" && runtime.GOARCH == "amd64" { search = "windows64" - // check Qt5 update after nekoray v3.3 - if _, err := os.Stat("../Qt5Core.dll"); err == nil { - search = "windows7-x64" - } } else if runtime.GOOS == "linux" && runtime.GOARCH == "amd64" { search = "linux64" } else if runtime.GOOS == "darwin" { diff --git a/libs/deploy_windows64.sh b/libs/deploy_windows64.sh index 403b899..c250719 100755 --- a/libs/deploy_windows64.sh +++ b/libs/deploy_windows64.sh @@ -2,11 +2,7 @@ set -e source libs/env_deploy.sh -if [ "$DL_QT_VER" == "5.15" ]; then - DEST=$DEPLOYMENT/windows7-x64 -else - DEST=$DEPLOYMENT/windows64 -fi +DEST=$DEPLOYMENT/windows64 rm -rf $DEST mkdir -p $DEST diff --git a/libs/download_qtsdk_win.sh b/libs/download_qtsdk_win.sh index 690fdec..f683210 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.2-Windows-x86_64-VS2022-17.6.5-20230803.7z + curl -LSO https://github.com/MatsuriDayo/nekoray_qt_runtime/releases/download/20220503/Qt6.7.2-Windows-x86_64-VS2022-17.10.3-20240621.7z fi 7z x *.7z rm *.7z diff --git a/sub/GroupUpdater.cpp b/sub/GroupUpdater.cpp index 7d40dc2..6ad7eb1 100644 --- a/sub/GroupUpdater.cpp +++ b/sub/GroupUpdater.cpp @@ -192,7 +192,7 @@ namespace NekoGui_sub { try { return n.as(); } catch (const YAML::Exception &ex2) { - ex2.what(); + qDebug() << ex2.what(); } qDebug() << ex.what(); return def;