Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

update qt

Browse Source
This commit is contained in:
armv9
2024-07-05 10:51:52 +09:00
parent f6cf1414bf
commit be0eae662b
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/build-nekoray-cmake.yml vendored
View File

@@ -4,20 +4,20 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
tag: tag:
description: 'Release Tag' description: "Release Tag"
required: true required: true
publish: publish:
description: 'Publish: If want ignore' description: "Publish: If want ignore"
required: false required: false
artifact-pack: artifact-pack:
description: 'artifact-pack: If want ignore' description: "artifact-pack: If want ignore"
required: false required: false
jobs: jobs:
build-go: build-go:
strategy: strategy:
matrix: matrix:
cross_os: [ windows, linux ] cross_os: [windows, linux]
cross_arch: [ amd64 ] cross_arch: [amd64]
include: include:
- cross_os: public_res - cross_os: public_res
cross_arch: public_res cross_arch: public_res
@@ -38,7 +38,7 @@ jobs:
if: steps.cache-common.outputs.cache-hit != 'true' if: steps.cache-common.outputs.cache-hit != 'true'
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: ^1.21 go-version: ^1.22
- name: Build golang parts - name: Build golang parts
if: steps.cache-common.outputs.cache-hit != 'true' if: steps.cache-common.outputs.cache-hit != 'true'
shell: bash shell: bash
@@ -61,7 +61,7 @@ jobs:
include: include:
- platform: windows-2022 - platform: windows-2022
arch: x64 arch: x64
qt_version: "6.5" qt_version: "6.7"
- platform: ubuntu-20.04 - platform: ubuntu-20.04
arch: x64 arch: x64
qt_version: "5.12" qt_version: "5.12"

4
go/grpc_server/update.go
View File

@@ -53,10 +53,6 @@ func (s *BaseServer) Update(ctx context.Context, in *gen.UpdateReq) (*gen.Update
var search string var search string
if runtime.GOOS == "windows" && runtime.GOARCH == "amd64" { if runtime.GOOS == "windows" && runtime.GOARCH == "amd64" {
search = "windows64" 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" { } else if runtime.GOOS == "linux" && runtime.GOARCH == "amd64" {
search = "linux64" search = "linux64"
} else if runtime.GOOS == "darwin" { } else if runtime.GOOS == "darwin" {

6
libs/deploy_windows64.sh
View File

@@ -2,11 +2,7 @@
set -e set -e
source libs/env_deploy.sh source libs/env_deploy.sh
if [ "$DL_QT_VER" == "5.15" ]; then DEST=$DEPLOYMENT/windows64
DEST=$DEPLOYMENT/windows7-x64
else
DEST=$DEPLOYMENT/windows64
fi
rm -rf $DEST rm -rf $DEST
mkdir -p $DEST mkdir -p $DEST

2
libs/download_qtsdk_win.sh
View File

@@ -3,7 +3,7 @@ cd qtsdk
if [ "$DL_QT_VER" == "5.15" ]; then 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 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 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 fi
7z x *.7z 7z x *.7z
rm *.7z rm *.7z

2
sub/GroupUpdater.cpp
View File

@@ -192,7 +192,7 @@ namespace NekoGui_sub {
try { try {
return n.as<int>(); return n.as<int>();
} catch (const YAML::Exception &ex2) { } catch (const YAML::Exception &ex2) {
ex2.what(); qDebug() << ex2.what();
} }
qDebug() << ex.what(); qDebug() << ex.what();
return def; return def;