From af4b9fa8dcae7420bcc0796dbde6f8a14a2f271a Mon Sep 17 00:00:00 2001 From: bgallois Date: Sun, 5 Nov 2023 15:21:18 +0100 Subject: [PATCH] [ci] global: update to Qt 6.6.0 --- .github/workflows/build.yml | 18 +++++++++--------- .github/workflows/build_cli.yml | 18 +++++++++--------- .github/workflows/test.yml | 7 ++++--- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10a0e98..1b4ea92 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,13 +5,13 @@ on: branches: [master] env: - QT_VERSION: 6.5.2 + QT_VERSION: 6.6.0 OPENCV_VERSION: 4.8.0 OPENCV_VERSION_: 480 jobs: build_linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -25,13 +25,13 @@ jobs: sudo apt-get install libxcb-* sudo apt-get install libxkb-* sudo apt-get install libavcodec-dev libavformat-dev libswscale-dev libnss3 - sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev + sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libunwind-dev libfuse2 libmysqlclient-dev sudo apt-get install libopencv-dev - name: install_qt6 run: | pip install aqtinstall - python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop ${{ env.QT_VERSION }} - echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/ >> $GITHUB_PATH + python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.5.2 + echo ${{ github.workspace }}/Qt/6.5.2/gcc_64/bin/ >> $GITHUB_PATH - name: build_ft run: | ./run.sh ci @@ -43,9 +43,9 @@ jobs: cp ../sh.fasttrack.fasttrack.desktop appdir cp ../src/assets/fasttrack.png appdir cp fasttrack appdir - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/lib/ + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/6.5.2/gcc_64/lib/ chmod +x deploy.AppImage - ./deploy.AppImage appdir/fasttrack -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so + ./deploy.AppImage appdir/fasttrack -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/6.5.2/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so mkdir -p appdir/usr/share/fasttrack/ cp *.qm appdir/usr/share/fasttrack wget -O tool.AppImage https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage @@ -135,9 +135,9 @@ jobs: make cd build/ macdeployqt FastTrack.app -always-overwrite - wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py + wget https://raw.githubusercontent.com/arl/macdeployqtfix/5cdb8ff78a77928206e0d7ef89dd4c4b358a5b15/macdeployqtfix.py cp *.qm FastTrack.app/Contents/Resources/ - python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/ + python macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/ hdiutil create -volname FastTrack -srcfolder FastTrack.app -ov -format UDZO FastTrack.dmg - name: upload_artefact uses: actions/upload-artifact@v1 diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml index 095c469..9e209e4 100644 --- a/.github/workflows/build_cli.yml +++ b/.github/workflows/build_cli.yml @@ -5,13 +5,13 @@ on: branches: [master] env: - QT_VERSION: 6.5.2 + QT_VERSION: 6.6.0 OPENCV_VERSION: 4.8.0 OPENCV_VERSION_: 480 jobs: build_linux: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -25,13 +25,13 @@ jobs: sudo apt-get install libxcb-* sudo apt-get install libxkb-* sudo apt-get install libavcodec-dev libavformat-dev libswscale-dev libnss3 - sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev + sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libunwind-dev libfuse2 libmysqlclient-dev sudo apt-get install libopencv-dev - name: install_qt6 run: | pip install aqtinstall - python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop ${{ env.QT_VERSION }} - echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/ >> $GITHUB_PATH + python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop 6.5.2 + echo ${{ github.workspace }}/Qt/6.5.2/gcc_64/bin/ >> $GITHUB_PATH - name: build_ftcli run: | ./run.sh cli @@ -42,8 +42,8 @@ jobs: chmod +x deploy.AppImage cp sh.fasttrack.fasttrackcli.desktop build_cli/ cp src/assets/fasttrack.png build_cli/ - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/lib/ - ./deploy.AppImage build_cli/fasttrack-cli -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${{ github.workspace }}/Qt/6.5.2/gcc_64/lib/ + ./deploy.AppImage build_cli/fasttrack-cli -appimage -no-translations -bundle-non-qt-libs -unsupported-allow-new-glibc -qmake=${{ github.workspace }}/Qt/6.5.2/gcc_64/bin/qmake6 -extra-plugins=platforms/,sqldrivers/ -exclude-libs=libgmodule-2.0.so mv FastTrack*.AppImage FastTrack-cli-x86_64.AppImage - name: upload_artefact uses: actions/upload-artifact@v2 @@ -128,8 +128,8 @@ jobs: make cd build_cli/ macdeployqt FastTrack-cli.app -always-overwrite - wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py - python2.7 macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/ + wget https://raw.githubusercontent.com/arl/macdeployqtfix/5cdb8ff78a77928206e0d7ef89dd4c4b358a5b15/macdeployqtfix.py + python macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/ hdiutil create -volname FastTrack-cli -srcfolder FastTrack-cli.app -ov -format UDZO FastTrack-cli.dmg - name: upload_artefact uses: actions/upload-artifact@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4a53574..84cbe42 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: branches: - master env: - QT_VERSION: 6.5.2 + QT_VERSION: 6.6.0 OPENCV_VERSION: 4.8.0 jobs: @@ -88,7 +88,7 @@ jobs: - name: install_qt6 run: | pip install aqtinstall - python3 -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }} + python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }} echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos/bin/ >> $GITHUB_PATH - name: Set up Homebrew #https://github.com/Homebrew/homebrew-cask/issues/150323 id: set-up-homebrew @@ -105,7 +105,8 @@ jobs: brew upgrade -q -f brew install pkg-config brew install libomp - brew install opencv + brew tap FastTrackOrg/fasttrack + brew install --build-from-source FastTrackOrg/fasttrack/opencv brew install googletest export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/ python -m pip install --upgrade pip setuptools wheel