Skip to content

Commit 47534b0

Browse files
RealChuanRealChuan
committed
[升级Qt版本至6.10.2并更新CI相关配置]: 将项目依赖的Qt版本从6.10.0升级至6.10.2，同时将GitHub Actions中的checkout action升级到v6，并统一YAML文件中的字符串引号格式
-**.github/actions/install-dependencies/action.yml**: 将Qt默认版本由6.10.0更新为6.10.2，并统一字符串引号为双引号 -**.github/workflows/cmake.yml**: 将actions/checkout从v5升级至v6，统一YAML字符串引号格式 -**.github/workflows/codeql.yml**: 升级actions/checkout至v6，移除多余空行，统一引号格式 -**.github/workflows/qmake.yml**: 升级actions/checkout至v6，统一引号格式 -**.github/workflows/readme.yml**: 将actions/checkout升级到v6 -**.vscode/settings.json**: 将Qt路径从6.10.0更新为6.10.2 -**.cmake/QtSetup.cmake**: 更新Windows和Linux平台默认Qt路径为6.10.2 -**.packaging/macos/package.sh**: 更新macOS打包脚本中的qmake和macdeployqt路径至6.10.2
1 parent 4958b9c commit 47534b0

8 files changed

Lines changed: 114 additions & 115 deletions

File tree

‎.github/actions/install-dependencies/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
name: 'Install Dependencies'
2-
description: 'Install qt environment and compile dependencies'
1+
name: "Install Dependencies"
2+
description: "Install qt environment and compile dependencies"
33
inputs:
44
qt_modules:
5-
description: 'qt modules'
5+
description: "qt modules"
66
required: false
7-
default: 'qt5compat qtnetworkauth qtimageformats'
7+
default: "qt5compat qtnetworkauth qtimageformats"
88
type: string
99
qt_ver:
10-
description: 'qt version'
10+
description: "qt version"
1111
required: false
12-
default: '6.10.0'
12+
default: "6.10.2"
1313
type: string
1414

1515
runs:
16-
using: 'composite'
16+
using: "composite"
1717

1818
steps:
1919
- name: Install dependencies on windows
@@ -47,4 +47,4 @@ runs:
4747
with:
4848
version: ${{ inputs.qt_ver }}
4949
modules: ${{ inputs.qt_modules }}
50-
cache: 'true'
50+
cache: "true"

‎.github/workflows/cmake.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,34 @@ name: CMake Build
33
on:
44
push:
55
paths-ignore:
6-
- 'docs/**'
7-
- 'packaging/**'
8-
- 'qmake/**'
9-
- 'translations/**'
10-
- '**/*.md'
11-
- '**/.clang-*'
12-
- '**/.gitignore'
13-
- '**/*.pri'
14-
- '**/LICENSE*'
15-
- '**/*.pro'
16-
- '**/README*'
6+
- "docs/**"
7+
- "packaging/**"
8+
- "qmake/**"
9+
- "translations/**"
10+
- "**/*.md"
11+
- "**/.clang-*"
12+
- "**/.gitignore"
13+
- "**/*.pri"
14+
- "**/LICENSE*"
15+
- "**/*.pro"
16+
- "**/README*"
1717
pull_request:
1818
paths-ignore:
19-
- 'docs/**'
20-
- 'packaging/**'
21-
- 'qmake/**'
22-
- 'translations/**'
23-
- '**/*.md'
24-
- '**/.clang-*'
25-
- '**/.gitignore'
26-
- '**/*.pri'
27-
- '**/LICENSE*'
28-
- '**/*.pro'
29-
- '**/README*'
19+
- "docs/**"
20+
- "packaging/**"
21+
- "qmake/**"
22+
- "translations/**"
23+
- "**/*.md"
24+
- "**/.clang-*"
25+
- "**/.gitignore"
26+
- "**/*.pri"
27+
- "**/LICENSE*"
28+
- "**/*.pro"
29+
- "**/README*"
3030

3131
env:
32-
MACOSX_DEPLOYMENT_TARGET: '13.0'
33-
MACOSX_BUILD_ARCHS: 'x86_64;arm64'
32+
MACOSX_DEPLOYMENT_TARGET: "13.0"
33+
MACOSX_BUILD_ARCHS: "x86_64;arm64"
3434
BUILD_DIR: build
3535
BUILD_TYPE: RelWithDebInfo
3636

@@ -49,7 +49,7 @@ jobs:
4949
- "Ninja"
5050

5151
steps:
52-
- uses: actions/checkout@v5
52+
- uses: actions/checkout@v6
5353
with:
5454
fetch-depth: 1
5555

‎.github/workflows/codeql.yml‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,47 @@ name: CodeQL
33
on:
44
push:
55
paths-ignore:
6-
- 'docs/**'
7-
- 'packaging/**'
8-
- 'qmake/**'
9-
- 'translations/**'
10-
- '**/*.md'
11-
- '**/*.txt'
12-
- '**/.clang-*'
13-
- '**/.gitignore'
14-
- '**/*.pri'
15-
- '**/LICENSE*'
16-
- '**/*.pro'
17-
- '**/README*'
6+
- "docs/**"
7+
- "packaging/**"
8+
- "qmake/**"
9+
- "translations/**"
10+
- "**/*.md"
11+
- "**/*.txt"
12+
- "**/.clang-*"
13+
- "**/.gitignore"
14+
- "**/*.pri"
15+
- "**/LICENSE*"
16+
- "**/*.pro"
17+
- "**/README*"
1818
branches-ignore:
19-
- 'dependabot/**'
19+
- "dependabot/**"
2020
pull_request:
2121
paths-ignore:
22-
- 'docs/**'
23-
- 'packaging/**'
24-
- 'qmake/**'
25-
- 'translations/**'
26-
- '**/*.md'
27-
- '**/*.txt'
28-
- '**/.clang-*'
29-
- '**/.gitignore'
30-
- '**/*.pri'
31-
- '**/LICENSE*'
32-
- '**/*.pro'
33-
- '**/README*'
22+
- "docs/**"
23+
- "packaging/**"
24+
- "qmake/**"
25+
- "translations/**"
26+
- "**/*.md"
27+
- "**/*.txt"
28+
- "**/.clang-*"
29+
- "**/.gitignore"
30+
- "**/*.pri"
31+
- "**/LICENSE*"
32+
- "**/*.pro"
33+
- "**/README*"
3434
branches-ignore:
35-
- 'dependabot/**'
36-
35+
- "dependabot/**"
36+
3737
schedule:
38-
- cron: '0 0 1 * *'
38+
- cron: "0 0 1 * *"
3939
workflow_dispatch:
40-
40+
4141
jobs:
4242
CodeQL:
4343
runs-on: ubuntu-latest
44-
45-
steps:
46-
- uses: actions/checkout@v5
44+
45+
steps:
46+
- uses: actions/checkout@v6
4747
with:
4848
fetch-depth: 1
4949

@@ -52,11 +52,10 @@ jobs:
5252
- name: Initialize CodeQL
5353
uses: github/codeql-action/init@v4
5454
with:
55-
languages: cpp
55+
languages: cpp
5656

5757
- name: Autobuild
5858
uses: github/codeql-action/autobuild@v4
5959

6060
- name: Perform CodeQL Analysis
6161
uses: github/codeql-action/analyze@v4
62-

‎.github/workflows/qmake.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
name: QMake Build
22

3-
on:
3+
on:
44
push:
55
paths-ignore:
6-
- 'cmake/**'
7-
- 'docs/**'
8-
- 'packaging/**'
9-
- 'translations/**'
10-
- '**/CMakeLists.txt'
11-
- '**/*.md'
12-
- '**/*.txt'
13-
- '**/.clang-*'
14-
- '**/.gitignore'
15-
- '**/LICENSE*'
16-
- '**/README*'
17-
- 'vcpkg.json'
6+
- "cmake/**"
7+
- "docs/**"
8+
- "packaging/**"
9+
- "translations/**"
10+
- "**/CMakeLists.txt"
11+
- "**/*.md"
12+
- "**/*.txt"
13+
- "**/.clang-*"
14+
- "**/.gitignore"
15+
- "**/LICENSE*"
16+
- "**/README*"
17+
- "vcpkg.json"
1818
pull_request:
1919
paths-ignore:
20-
- 'cmake/**'
21-
- 'docs/**'
22-
- 'packaging/**'
23-
- 'translations/**'
24-
- '**/CMakeLists.txt'
25-
- '**/*.md'
26-
- '**/*.txt'
27-
- '**/.clang-*'
28-
- '**/.gitignore'
29-
- '**/LICENSE*'
30-
- '**/README*'
31-
- 'vcpkg.json'
20+
- "cmake/**"
21+
- "docs/**"
22+
- "packaging/**"
23+
- "translations/**"
24+
- "**/CMakeLists.txt"
25+
- "**/*.md"
26+
- "**/*.txt"
27+
- "**/.clang-*"
28+
- "**/.gitignore"
29+
- "**/LICENSE*"
30+
- "**/README*"
31+
- "vcpkg.json"
3232

3333
env:
3434
MACOSX_DEPLOYMENT_TARGET: 13.0
35-
MACOSX_BUILD_ARCHS: 'x86_64 arm64'
35+
MACOSX_BUILD_ARCHS: "x86_64 arm64"
3636
BUILD_DIR: build
3737

3838
jobs:
@@ -48,10 +48,10 @@ jobs:
4848
- ubuntu-latest
4949

5050
steps:
51-
- uses: actions/checkout@v5
52-
with:
51+
- uses: actions/checkout@v6
52+
with:
5353
fetch-depth: 1
54-
54+
5555
- uses: ./.github/actions/install-dependencies
5656

5757
- uses: RealChuan/install-jom@main
@@ -68,7 +68,7 @@ jobs:
6868
..\packaging\windows\Enter-VsDevShell.ps1
6969
& qmake ..\.
7070
& jom
71-
71+
7272
- name: Build linux
7373
if: runner.os == 'Linux'
7474
working-directory: ${{ env.BUILD_DIR }}
@@ -83,4 +83,4 @@ jobs:
8383
shell: bash
8484
run: |
8585
qmake QMAKE_APPLE_DEVICE_ARCHS="${{ env.MACOSX_BUILD_ARCHS }}" ../.
86-
make -j $(sysctl -n hw.ncpu)
86+
make -j $(sysctl -n hw.ncpu)

‎.github/workflows/readme.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
Translate:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
- uses: actions/setup-node@v6
17-
# ISO Langusge Codes: https://cloud.google.com/translate/docs/languages
17+
# ISO Langusge Codes: https://cloud.google.com/translate/docs/languages
1818
- name: Adding README - English
1919
uses: dephraiim/translate-readme@main
2020
with:
21-
LANG: en
21+
LANG: en

‎.vscode/settings.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"cmake.configureEnvironment": {
3-
"CMAKE_MAKE_PROGRAM": "C:\\Qt\\Tools\\Ninja\\ninja.exe;"
4-
},
5-
"cmake.generator": "Ninja",
6-
"cmake.environment": {
7-
"PATH": "C:\\Qt\\6.10.0\\msvc2022_64\\bin;${env:PATH};"
8-
}
9-
}
2+
"cmake.configureEnvironment": {
3+
"CMAKE_MAKE_PROGRAM": "C:\\Qt\\Tools\\Ninja\\ninja.exe;"
4+
},
5+
"cmake.generator": "Ninja",
6+
"cmake.environment": {
7+
"PATH": "C:\\Qt\\6.10.2\\msvc2022_64\\bin;${env:PATH};"
8+
}
9+
}

‎cmake/QtSetup.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# =============================================================================
44

55
if(CMAKE_HOST_WIN32)
6-
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.10.0\\msvc2022_64")
7-
message(STATUS "Setting Windows Qt path: C:\\Qt\\6.10.0\\msvc2022_64")
6+
list(APPEND CMAKE_PREFIX_PATH "C:\\Qt\\6.10.2\\msvc2022_64")
7+
message(STATUS "Setting Windows Qt path: C:\\Qt\\6.10.2\\msvc2022_64")
88
elseif(CMAKE_HOST_APPLE)
99
# macOS路径 - 可以根据需要填写具体路径 list(APPEND CMAKE_PREFIX_PATH "/path/to/qt/macos")
1010
message(STATUS "macOS Qt path - configure as needed")
1111
elseif(CMAKE_HOST_LINUX)
12-
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.10.0/gcc_64")
13-
message(STATUS "Setting Linux Qt path: /opt/Qt/6.10.0/gcc_64")
12+
list(APPEND CMAKE_PREFIX_PATH "/opt/Qt/6.10.2/gcc_64")
13+
message(STATUS "Setting Linux Qt path: /opt/Qt/6.10.2/gcc_64")
1414
endif()
1515

1616
function(setup_qt_definitions)

‎packaging/macos/package.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ project_root=$PWD
88
echo "Project root: ${project_root}"
99

1010
echo "Start compiling..."
11-
qmake="/Users/runner/Qt/6.10.0/macos/bin/qmake"
11+
qmake="/Users/runner/Qt/6.10.2/macos/bin/qmake"
1212
build_dir="${project_root}/build/Desktop_Qt_6_8_1_macosbit-Release"
1313

1414
rm -rf ${build_dir}
@@ -29,7 +29,7 @@ cp -af -v ${project_root}/bin-64/Release/Qt-App.app ${packet_dir}/
2929
safe_rm "${release_dir}/Qt-App.app"
3030

3131
# deploy Qt-App
32-
macdeployqt="/Users/fxy/Qt/6.10.0/macos/bin/macdeployqt"
32+
macdeployqt="/Users/fxy/Qt/6.10.2/macos/bin/macdeployqt"
3333
${macdeployqt} ${packet_dir}/Qt-App.app -always-overwrite
3434
cp -af -v ${packet_dir}/Qt-App.app ${release_dir}/
3535

0 commit comments

Comments
 (0)