diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bdd747..4824793 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,30 +9,30 @@ jobs: fail-fast: false matrix: include: - - os: windows-latest - os-name: windows - qt-version: '5.12' - mingw-short-version: 73 - qt5-extra-archives: 'qtwinextras opengl32sw i686' +# - os: windows-latest +# os-name: windows +# qt-version: '5.12' +# mingw-short-version: 73 +# qt5-extra-archives: 'qtwinextras opengl32sw i686' - - os: ubuntu-latest - os-name: linux - qt-version: '5.12' - qt5-extra-archives: 'qtx11extras icu' +# - os: ubuntu-latest +# os-name: linux +# qt-version: '5.12' +# qt5-extra-archives: 'qtx11extras icu' - os: ubuntu-latest os-name: linux qt-version: '5.15' qt5-extra-archives: 'qtx11extras icu' - - os: macos-12 + - os: macos-13 os-name: mac - qt-version: '5.12' + qt-version: '6.8' qt5-extra-archives: 'qtmacextras' - os: ubuntu-latest os-name: linux - qt-version: '6.5' + qt-version: '6.8' defaults: run: @@ -54,6 +54,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: + aqtversion: '==3.3.*' version: ${{ matrix.qt-version }} host: ${{ matrix.os-name }} modules: ${{ startsWith(matrix.qt-version, '6') && 'qt5compat qtmultimedia qtimageformats' || '' }} @@ -117,7 +118,7 @@ jobs: - name: Lint if: ${{ matrix.os == 'ubuntu-latest'}} - uses: cpp-linter/cpp-linter-action@v2.13.4 + uses: cpp-linter/cpp-linter-action@v2.14.0 id: linter with: style: 'file'