diff --git a/.github/workflows/build-external-graphviz.yml b/.github/workflows/build-external-graphviz.yml index 1d14cba3..3e6ae00f 100644 --- a/.github/workflows/build-external-graphviz.yml +++ b/.github/workflows/build-external-graphviz.yml @@ -27,7 +27,7 @@ jobs: - Shared - Static config: - - qt_version: 6.6.2 + - qt_version: 6.9.3 qt_modules: qtscxml qtremoteobjects steps: diff --git a/.github/workflows/build-sanitizers.yml b/.github/workflows/build-sanitizers.yml index a2472168..6e314de0 100644 --- a/.github/workflows/build-sanitizers.yml +++ b/.github/workflows/build-sanitizers.yml @@ -37,9 +37,13 @@ jobs: - name: Setup Sanitized Qt uses: KDABLabs/sanitized-qt-action@v1 with: - qt-tag: "v6.11.0-beta2" + qt-tag: "v6.12.0-beta1" qt-flavor: ${{ matrix.qt-flavor }} + - name: Install dependencies + run: | + sudo apt install libwayland-dev wayland-protocols -y + - name: Configure project run: > cmake --preset=${{ matrix.preset }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6467f0bb..f8da7970 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,13 +29,8 @@ jobs: - Shared - Static config: - - qt_version: 6.6.2 + - qt_version: 6.9.3 qt_modules: qtscxml qtremoteobjects - qt_arch: win64_msvc2019_64 - macos_architectures: "x86_64;arm64" - - qt_version: 6.10.0 # Bump to latest freely - qt_modules: qtscxml qtremoteobjects - qt_arch: win64_msvc2022_64 macos_architectures: "x86_64;arm64" steps: - name: Install Dependencies on Linux @@ -49,22 +44,11 @@ jobs: run: brew install bison - name: Install Qt ${{ matrix.config.qt_version }} with options and default aqtversion (Linux/macOS) - if: ${{ runner.os != 'Windows' }} - uses: jurplel/install-qt-action@v4 - with: - aqtversion: null # use whatever the default is - modules: ${{ matrix.config.qt_modules }} - version: ${{ matrix.config.qt_version }} - cache: true - - - name: Install Qt with options and default aqtversion (Windows) - if: ${{ runner.os == 'Windows' }} uses: jurplel/install-qt-action@v4 with: aqtversion: null # use whatever the default is modules: ${{ matrix.config.qt_modules }} version: ${{ matrix.config.qt_version }} - arch: ${{ matrix.config.qt_arch }} cache: true - name: Install ninja-build tool (must be after Qt due PATH changes)