diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10a0e98..d363aa2 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 @@ -137,7 +137,7 @@ jobs: macdeployqt FastTrack.app -always-overwrite wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py cp *.qm FastTrack.app/Contents/Resources/ - python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/ + #python2.7 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..5305746 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 @@ -129,7 +129,7 @@ jobs: 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 }}/ + #python2.7 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..bac4350 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: