Skip to content

Commit 31e9be2

Browse files
bgalloisbgallois
committed
[ci] global: update to Qt 6.2.2 LTS
1 parent 85476fe commit 31e9be2

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: install qt6
2626
run: |
2727
pip install aqtinstall
28-
python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.2.1
29-
echo ${{ github.workspace }}/Qt/6.2.1/gcc_64/bin/ >> $GITHUB_PATH
28+
python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.2.2
29+
echo ${{ github.workspace }}/Qt/6.2.2/gcc_64/bin/ >> $GITHUB_PATH
3030
- name: build
3131
run: |
3232
./run.sh ci
@@ -37,8 +37,8 @@ jobs:
3737
chmod +x deploy.AppImage
3838
cp sh.fasttrack.fasttrack.desktop build/
3939
cp src/assets/fasttrack.png build/
40-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/6.2.1/gcc_64/lib/
41-
./deploy.AppImage build/fasttrack -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/6.2.1/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so
40+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/6.2.2/gcc_64/lib/
41+
./deploy.AppImage build/fasttrack -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/6.2.2/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so
4242
mv FastTrack*.AppImage FastTrack-x86_64.AppImage
4343
- name: Linux artefact
4444
uses: actions/upload-artifact@v1
@@ -56,8 +56,8 @@ jobs:
5656
- name: install qt6
5757
run: |
5858
pip install aqtinstall
59-
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ windows desktop 6.2.1 win64_msvc2019_64
60-
echo "${{ github.workspace }}/Qt/6.2.1/msvc2019_64/bin/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
59+
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ windows desktop 6.2.2 win64_msvc2019_64
60+
echo "${{ github.workspace }}/Qt/6.2.2/msvc2019_64/bin/" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
6161
- name: install opencv
6262
shell: cmd
6363
run: |
@@ -101,8 +101,8 @@ jobs:
101101
- name: install qt6
102102
run: |
103103
pip install aqtinstall
104-
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ mac desktop 6.2.1
105-
echo ${{ github.workspace }}/Qt/6.2.1/macos/bin/ >> $GITHUB_PATH
104+
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ mac desktop 6.2.2
105+
echo ${{ github.workspace }}/Qt/6.2.2/macos/bin/ >> $GITHUB_PATH
106106
- name: install opencv
107107
run: |
108108
rm -rf /usr/local/bin/2to3
@@ -121,7 +121,7 @@ jobs:
121121
cd build/
122122
macdeployqt FastTrack.app -always-overwrite
123123
wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
124-
python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/6.2.1/
124+
python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/6.2.2/
125125
hdiutil create -volname FastTrack -srcfolder FastTrack.app -ov -format UDZO FastTrack.dmg
126126
127127
- name: Mac artefact

‎.github/workflows/build_cli.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
- name: install qt6
2626
run: |
2727
pip install aqtinstall
28-
python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.2.1
29-
echo ${{ github.workspace }}/Qt/6.2.1/gcc_64/bin/ >> $GITHUB_PATH
28+
python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.2.2
29+
echo ${{ github.workspace }}/Qt/6.2.2/gcc_64/bin/ >> $GITHUB_PATH
3030
- name: build
3131
run: |
3232
./run.sh cli
@@ -37,8 +37,8 @@ jobs:
3737
chmod +x deploy.AppImage
3838
cp sh.fasttrack.fasttrackcli.desktop build_cli/
3939
cp src/assets/fasttrack.png build_cli/
40-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/6.2.1/gcc_64/lib/
41-
./deploy.AppImage build_cli/fasttrack-cli -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/6.2.1/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so
40+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/6.2.2/gcc_64/lib/
41+
./deploy.AppImage build_cli/fasttrack-cli -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/6.2.2/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so
4242
mv FastTrack*.AppImage FastTrack-cli-x86_64.AppImage
4343
- name: Linux artefact
4444
uses: actions/upload-artifact@v1
@@ -55,8 +55,8 @@ jobs:
5555
- name: install qt6
5656
run: |
5757
pip install aqtinstall
58-
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ mac desktop 6.2.1
59-
echo ${{ github.workspace }}/Qt/6.2.1/macos/bin/ >> $GITHUB_PATH
58+
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ mac desktop 6.2.2
59+
echo ${{ github.workspace }}/Qt/6.2.2/macos/bin/ >> $GITHUB_PATH
6060
- name: install opencv
6161
run: |
6262
rm -rf /usr/local/bin/2to3
@@ -72,7 +72,7 @@ jobs:
7272
cd build_cli/
7373
macdeployqt FastTrack-cli.app -always-overwrite
7474
wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
75-
python2.7 macdeployqtfix.py fasttrack_cli.app/Contents/MacOS/fasttrack-cli ../../Qt/6.2.1/
75+
python2.7 macdeployqtfix.py fasttrack_cli.app/Contents/MacOS/fasttrack-cli ../../Qt/6.2.2/
7676
hdiutil create -volname FastTrack-cli -srcfolder FastTrack-cli.app -ov -format UDZO FastTrack-cli.dmg
7777
7878

0 commit comments

Comments
 (0)