Skip to content

Commit 6d17b59

Browse files
KangLinKangLin
committed
CI: modify ci
1 parent cae0c74 commit 6d17b59

File tree

7 files changed

+26
-33
lines changed

7 files changed

+26
-33
lines changed

‎.github/workflows/android.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
matrix:
1717
BUILD_TYPE: [Release]
1818
qt_arch: [android_arm64_v8a, android_x86_64]
19-
qt_version: [6.6.3]
19+
qt_version: [6.8.3]
2020
include:
2121
- qt_arch: android_arm64_v8a
2222
VCPKG_TARGET_TRIPLET: arm64-android
@@ -37,7 +37,7 @@ jobs:
3737
SOURCE_DIR: ${{github.workspace}}/.cache/source
3838
TOOSL_DIR: ${{github.workspace}}/.cache/tools
3939
INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}
40-
VCPKGGITCOMMITID: 110c50d4700794d87d95138cd8c1b3bbfee9bab5
40+
VCPKGGITCOMMITID: d8ad13c401b30c2836d00b8923c9127f05f591c7
4141
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4242
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4343
VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
@@ -71,7 +71,7 @@ jobs:
7171
echo "ANDROID_NDK:${ANDROID_NDK}"
7272
7373
- name: Cache installed
74-
uses: actions/cache@v2
74+
uses: actions/cache@v4
7575
id: cache-installed
7676
with:
7777
path: |

‎.github/workflows/codespell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ jobs:
1818
with:
1919
check_filenames: true
2020
path: ${{github.workspace}}
21-
skip: "*.lua,codespell.yml,*.ts,qt-installer.sh"
21+
skip: "*.lua,codespell.yml,*.ts,qt-installer.sh,flags.patch,vcpkg/,vcpkg/*.*,vcpkg/*"
2222
ignore_words_list: "nD,rabits"

‎.github/workflows/doxygen.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
cmake -E make_directory ${{github.workspace}}/build
4343
4444
- name: Cache installed
45-
uses: actions/cache@v2
45+
uses: actions/cache@v4
4646
id: cache-installed
4747
with:
4848
path: |

‎.github/workflows/macos.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
matrix:
1717
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1818
BUILD_TYPE: [Release, Debug]
19-
qt_version: [6.7.1, 5.15.2, 5.12.12]
19+
qt_version: [6.9.0, 5.15.2, 5.12.12]
2020
qt_arch: [clang_64]
2121
VCPKG_TARGET_TRIPLET: [x64-osx]
2222
include:
23-
- qt_version: 6.7.1
23+
- qt_version: 6.9.0
2424
qt_modules: qtscxml qtpositioning qt5compat qtwebchannel qtpositioning qtmultimedia
2525
ENABLE_DOWNLOAD_MODULE: ON
2626

@@ -40,7 +40,7 @@ jobs:
4040
TOOSL_DIR: ${{github.workspace}}/.cache/tools
4141
INSTALL_DIR: ${{github.workspace}}/.cache/install_2024_03_13
4242
qt_modules: qtwebengine ${{matrix.qt_modules}}
43-
VCPKGGITCOMMITID: 110c50d4700794d87d95138cd8c1b3bbfee9bab5
43+
VCPKGGITCOMMITID: d8ad13c401b30c2836d00b8923c9127f05f591c7
4444
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4545
artifact_name: build_macos
4646
FaceRecognizer_VERSION: v0.0.4
@@ -64,7 +64,7 @@ jobs:
6464
cmake -E make_directory ${{github.workspace}}/build
6565
6666
- name: Cache installed
67-
uses: actions/cache@v3
67+
uses: actions/cache@v4
6868
id: cache-installed
6969
with:
7070
path: |
@@ -170,7 +170,7 @@ jobs:
170170
7z a FaceRecognizer_${{env.FaceRecognizer_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/*
171171
172172
- name: Update artifact
173-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
173+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
174174
uses: actions/upload-artifact@v4
175175
with:
176176
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}

‎.github/workflows/mingw.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
mingw-w64-x86_64-nsis ^
5151
mingw-w64-x86_64-gcc ^
5252
mingw-w64-x86_64-qt5 ^
53-
mingw-w64-x86_64-qtwebkit ^
5453
mingw-w64-x86_64-zlib ^
5554
mingw-w64-x86_64-openssl ^
5655
mingw-w64-x86_64-cyrus-sasl ^
@@ -73,7 +72,7 @@ jobs:
7372
cmake -E make_directory ${{github.workspace}}\build
7473
7574
- name: Cache installed
76-
uses: actions/cache@v3
75+
uses: actions/cache@v4
7776
id: cache-installed
7877
with:
7978
path: |

‎.github/workflows/msvc.yml‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
strategy:
1414
matrix:
1515
BUILD_TYPE: [Release, Debug]
16-
qt_version: [6.7.1, 5.15.2, 5.12.12]
16+
qt_version: [6.8.3, 5.15.2, 5.12.12]
1717
include:
18-
- qt_version: 6.7.1
18+
- qt_version: 6.8.3
1919
qt_arch: win64_msvc2019_64
20-
qt_modules: qtscxml qtpositioning qtwebchannel qtwebsockets qtwebview qtmultimedia qt5compat
20+
qt_modules: qtscxml qtpositioning qtmultimedia qt5compat
2121
VCPKG_TARGET_TRIPLET: x64-windows
2222
VCPKG_PLATFORM_TOOLSET: v143
2323
CMAKE_GENERATOR_PLATFORM: x64
@@ -40,12 +40,13 @@ jobs:
4040
runs-on: windows-latest
4141

4242
env:
43+
BUILD_DIR: ${{github.workspace}}\build
4344
SOURCE_DIR: ${{github.workspace}}\.cache\source
4445
TOOSL_DIR: ${{github.workspace}}\.cache\tools
4546
INSTALL_DIR: ${{github.workspace}}\.cache\install_msvc_${{matrix.CMAKE_GENERATOR_PLATFORM}}_${{matrix.BUILD_TYPE}}
4647
CMAKE_GENERATOR: "Visual Studio 17 2022"
4748
CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
48-
VCPKGGITCOMMITID: 110c50d4700794d87d95138cd8c1b3bbfee9bab5
49+
VCPKGGITCOMMITID: d8ad13c401b30c2836d00b8923c9127f05f591c7
4950
VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
5051
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
5152
qt_modules: qtwebengine ${{matrix.qt_modules}}
@@ -75,7 +76,7 @@ jobs:
7576
cmake -E make_directory ${{env.INSTALL_DIR}}
7677
7778
- name: Cache installed
78-
uses: actions/cache@v3
79+
uses: actions/cache@v4
7980
id: cache-installed
8081
with:
8182
path: |
@@ -136,21 +137,15 @@ jobs:
136137
cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
137138
)
138139
139-
- name: Cache Qt
140-
id: cache-qt
141-
uses: actions/cache@v1 # not v2!
142-
with:
143-
path: ${{env.TOOSL_DIR}}/qt
144-
key: qt_${{matrix.qt_version}}_${{matrix.qt_arch}}
145-
146140
- name: Install Qt
147-
uses: jurplel/install-qt-action@v3
141+
uses: jurplel/install-qt-action@v4
148142
with:
149-
dir: '${{env.TOOSL_DIR}}/qt' # optional
143+
dir: '${{env.TOOLS_DIR}}/qt' # optional
150144
version: '${{matrix.qt_version}}' # optional, default is 5.15.2
151145
arch: '${{matrix.qt_arch}}' # optional
152-
modules: '${{env.qt_modules}}' # optional. See: https://ddalcino.github.io/aqt-list-server/
153-
cached: '${{steps.cache-qt.outputs.cache-hit}}' # optional, default is false
146+
modules: '${{env.qt_modules}}' # optional. see: https://ddalcino.github.io/aqt-list-server/
147+
cache: true
148+
cache-key-prefix: cached-qt_${{matrix.qt_version}}_${{matrix.qt_arch}}
154149

155150
- name: git clone RabbitCommon
156151
working-directory: ${{env.SOURCE_DIR}}
@@ -203,7 +198,7 @@ jobs:
203198
copy /Y FaceRecognizer_${{env.FaceRecognizer_VERSION}}_Setup.exe FaceRecognizer_${{env.FaceRecognizer_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_Setup.exe
204199
205200
- name: Update configure file
206-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
201+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.3' }}
207202
working-directory: ${{github.workspace}}\build
208203
run: |
209204
${{github.workspace}}\build\install\bin\FaceRecognizerApp.exe ^
@@ -215,7 +210,7 @@ jobs:
215210
-m "${{env.FaceRecognizer_VERSION}}"
216211
217212
- name: Update artifact
218-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.7.1' }}
213+
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.3' }}
219214
uses: actions/upload-artifact@v4
220215
with:
221216
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}

‎.github/workflows/ubuntu.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
qt6-base-dev qt6-base-dev-tools qt6-qpa-plugins \
6060
libqt6svg6-dev qt6-l10n-tools qt6-translations-l10n \
6161
qt6-scxml-dev qt6-multimedia-dev libqt6serialport6-dev \
62-
qt6-webengine-dev qt6-webengine-dev-tools \
6362
libqt6core5compat6-dev \
6463
libutf8proc-dev libpam0g-dev \
6564
libxkbcommon-dev libxkbcommon-x11-dev xorg-dev libx11-xcb-dev \
@@ -70,7 +69,7 @@ jobs:
7069
libsqlite3-dev
7170
7271
- name: Cache installed
73-
uses: actions/cache@v3
72+
uses: actions/cache@v4
7473
id: cache-installed
7574
with:
7675
path: |
@@ -124,7 +123,7 @@ jobs:
124123
facedetection_DIR: ${{env.INSTALL_DIR}}/lib/cmake/facedetection
125124
ENABLE_DOWNLOAD_MODULE: ON
126125
run: |
127-
export Qt6_DIR=/usr/lib/`uname -a`-linux-gnu/cmake/Qt6
126+
export Qt6_DIR=/usr/lib/`uname -a`-linux-gnu/cmake/Qt6
128127
./build_debpackage.sh
129128
cp ../facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb facerecognizer_${{env.FaceRecognizer_VERSION}}_amd64.deb
130129

0 commit comments

Comments
 (0)