diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 9b6585e6a..10f2fbcd7 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -35,7 +35,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.7.3' + version: '6.9.1' host: 'mac' arch: 'clang_64' modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' @@ -110,7 +110,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.7.3' + version: '6.9.1' host: 'mac' arch: 'clang_64' modules: 'qtcharts qtscxml qt5compat qtlocation qtmultimedia qtpositioning qtserialport qtspeech qtwebsockets qtwebengine qtshadertools qtwebchannel' diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 8a2c0e321..d35486d28 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -24,8 +24,8 @@ jobs: WIN_ARCH: "x64", os: windows-latest, QT_INST_DIR: "C:/", - QTDIR: "C:/Qt/6.7.3/msvc2019_64", - QT_ARCH: win64_msvc2019_64, + QTDIR: "C:/Qt/6.9.1/msvc2022_64", + QT_ARCH: win64_msvc2022_64, boost_dl: "${{ github.workspace }}\\downloads\\boost", lib_dir: "C:\\Libraries", generators: Ninja @@ -74,7 +74,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.7.3' + version: '6.9.1' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: false @@ -85,7 +85,7 @@ jobs: cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" choco install patch mkdir build && cd build - cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.7.3\msvc2019_64;C:\Libraries\boost_1_73_0" + cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.9.1\msvc2022_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 166f893ed..3258100c9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,8 +20,8 @@ jobs: WIN_ARCH: "x64", os: windows-latest, QT_INST_DIR: "C:/", - QTDIR: "C:/Qt/6.7.3/msvc2019_64", - QT_ARCH: win64_msvc2019_64, + QTDIR: "C:/Qt/6.9.1/msvc2022_64", + QT_ARCH: win64_msvc2022_64, boost_dl: "${{ github.workspace }}\\downloads\\boost", lib_dir: "C:\\Libraries", generators: Ninja @@ -39,7 +39,7 @@ jobs: echo github.workspace: ${{ github.workspace }} - uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.12' - name: Install basic dependencies on Windows if: startsWith(matrix.config.os, 'windows') run: | @@ -70,7 +70,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.7.3' + version: '6.9.1' dir: ${{matrix.config.QT_INST_DIR}} arch: ${{matrix.config.QT_ARCH}} setup-python: 'false' @@ -81,7 +81,7 @@ jobs: cmd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" choco install patch mkdir build && cd build - cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.7.3\msvc2019_64;C:\Libraries\boost_1_73_0" + cmake .. -G "${{ matrix.config.generators }}" -DCMAKE_BUILD_TYPE=Release -DENABLE_QT6=ON -DARCH_OPT=SSE4_2 -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DCMAKE_PREFIX_PATH="C:\Qt\6.9.1\msvc2022_64;C:\Libraries\boost_1_73_0" cmake --build . --config Release --target package - name: Check disk space run: Get-PSDrive