From 38db69cb87ca23b90daaafa1a9953e9f8076c375 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 03:43:05 +0000 Subject: [PATCH 1/4] Bump cpp-linter/cpp-linter-action from 2.13.4 to 2.14.0 Bumps [cpp-linter/cpp-linter-action](https://github.com/cpp-linter/cpp-linter-action) from 2.13.4 to 2.14.0. - [Release notes](https://github.com/cpp-linter/cpp-linter-action/releases) - [Commits](https://github.com/cpp-linter/cpp-linter-action/compare/v2.13.4...v2.14.0) --- updated-dependencies: - dependency-name: cpp-linter/cpp-linter-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bdd747..b8e7972 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -117,7 +117,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' From 13044b9865278e08adfc948a1fd9476bc680ef01 Mon Sep 17 00:00:00 2001 From: iakov Date: Mon, 31 Mar 2025 15:20:11 +0300 Subject: [PATCH 2/4] Qt5.15 and mac-13 --- .github/workflows/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b8e7972..08766f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,25 +9,25 @@ 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: '5.15' qt5-extra-archives: 'qtmacextras' - os: ubuntu-latest From 97f6850b2f3632702d724d33331bc4515dcbc721 Mon Sep 17 00:00:00 2001 From: iakov Date: Mon, 31 Mar 2025 16:02:16 +0300 Subject: [PATCH 3/4] Qt6 --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08766f9..bb6aec3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,12 +27,12 @@ jobs: - os: macos-13 os-name: mac - qt-version: '5.15' + qt-version: '6.*' qt5-extra-archives: 'qtmacextras' - os: ubuntu-latest os-name: linux - qt-version: '6.5' + qt-version: '6.*' defaults: run: From 45adafb77602b23dca1a1c621be29f7ee183838d Mon Sep 17 00:00:00 2001 From: iakov Date: Mon, 2 Jun 2025 16:26:20 +0300 Subject: [PATCH 4/4] Pin aqtversion to the most recent, pin Qt6 to recent LTS --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb6aec3..4824793 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,12 +27,12 @@ jobs: - os: macos-13 os-name: mac - qt-version: '6.*' + qt-version: '6.8' qt5-extra-archives: 'qtmacextras' - os: ubuntu-latest os-name: linux - qt-version: '6.*' + 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' || '' }}