Skip to content

Commit d234a1d

Browse files
committed
[fix] ci: fix qt6
1 parent f49bd29 commit d234a1d

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

.github/workflows/build_linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55

66
env:
7-
QT_VERSION: 6.7.2
7+
QT_VERSION: 6.10.3
88

99
jobs:
1010
build_linux:
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- uses: actions/setup-python@v2
1515
with:
16-
python-version: '3.8'
16+
python-version: '3.13'
1717
- name: install_opencv
1818
run: |
1919
sudo apt-get update

.github/workflows/build_win.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55

66
env:
7-
QT_VERSION: 6.7.2
7+
QT_VERSION: 6.10.3
88
OPENCV_VERSION: 4.10.0
99
OPENCV_VERSION_: 4100
1010

@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v2
1616
- uses: actions/setup-python@v2
1717
with:
18-
python-version: '3.8'
18+
python-version: '3.13'
1919
- name: install_qt
2020
run: |
2121
choco uninstall mingw
@@ -33,6 +33,8 @@ jobs:
3333
run: |
3434
mkdir build
3535
cd build
36+
set CMAKE_PREFIX_PATH=${{ github.workspace }}\Qt\${{ env.QT_VERSION }}\mingw_64
37+
set Qt6_DIR=%CMAKE_PREFIX_PATH%\lib\cmake\Qt6
3638
cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DSKIP_TEST=ON ../
3739
mingw32-make
3840
mv bin/fasttrack.exe bin/FastTrack.exe

.github/workflows/test.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches:
99
- master
1010
env:
11-
QT_VERSION: 6.11.1
11+
QT_VERSION: 6.10.3
1212
OPENCV_VERSION: 4.10.0
1313

1414
jobs:
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v2
1919
- uses: actions/setup-python@v2
2020
with:
21-
python-version: '3.11'
21+
python-version: '3.13'
2222
- name: install_qt6
2323
run: |
2424
sudo apt-get update
@@ -43,13 +43,13 @@ jobs:
4343
- uses: actions/checkout@v2
4444
- uses: actions/setup-python@v2
4545
with:
46-
python-version: '3.11'
46+
python-version: '3.13'
4747
- name: install_qt6
4848
run: |
4949
choco uninstall mingw
50-
pip install aqtinstall
51-
python3 -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ windows desktop ${{ env.QT_VERSION }} win64_mingw
52-
python3 -m aqt install-tool -O ${{ github.workspace }}/Qt/ windows desktop tools_mingw1310
50+
python -m pip install aqtinstall
51+
python -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ windows desktop ${{ env.QT_VERSION }} win64_mingw
52+
python -m aqt install-tool -O ${{ github.workspace }}/Qt/ windows desktop tools_mingw1310
5353
echo "${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/mingw_64/bin/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
5454
echo "${{ github.workspace }}/Qt/Tools/mingw1310_64/bin/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
5555
echo "CMAKE_PREFIX_PATH=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/mingw_64" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
@@ -78,14 +78,16 @@ jobs:
7878
- name: test_ft
7979
shell: bash
8080
run: |
81+
export CMAKE_PREFIX_PATH="${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/mingw_64"
82+
export Qt6_DIR="$CMAKE_PREFIX_PATH/lib/cmake/Qt6"
8183
./test.sh win
8284
8385
test_mac:
8486
runs-on: macos-latest
8587
steps:
8688
- uses: actions/setup-python@v5
8789
with:
88-
python-version: '3.11'
90+
python-version: '3.13'
8991
- uses: actions/checkout@v2
9092
- name: Set up Homebrew #https://github.com/Homebrew/homebrew-cask/issues/150323
9193
id: set-up-homebrew

0 commit comments

Comments
 (0)