From 95db5003d62f1ef0a5038641d0c96e6f80e21d08 Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:17:17 +0200 Subject: [PATCH 1/2] Use install-qt-action v4 --- .github/workflows/build.yml | 2 +- .github/workflows/utests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 067a232..06023de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev libgd-dev xvfb libxcb-cursor0 shell: bash - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: '6.6.*' - name: Configure CMake diff --git a/.github/workflows/utests.yml b/.github/workflows/utests.yml index b4db17f..407e708 100644 --- a/.github/workflows/utests.yml +++ b/.github/workflows/utests.yml @@ -24,7 +24,7 @@ jobs: sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev libgd-dev xvfb libxcb-cursor0 shell: bash - name: Install Qt - uses: jurplel/install-qt-action@v3 + uses: jurplel/install-qt-action@v4 with: version: '6.6.*' - name: Configure CMake From dea97aa16f823f2339c82a2b68e00fc682d0deda Mon Sep 17 00:00:00 2001 From: adazem009 <68537469+adazem009@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:18:58 +0200 Subject: [PATCH 2/2] Add Qt 6.7 workflow --- .github/workflows/build.yml | 11 ++++++++++- .github/workflows/utests.yml | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06023de..c228c0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,14 @@ env: jobs: build: + strategy: + matrix: + include: + - qt_version: '6.6' + qt_arch: 'gcc_64' + - qt_version: '6.7' + qt_arch: 'linux_gcc_64' + runs-on: ubuntu-latest steps: @@ -26,7 +34,8 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.6.*' + version: '${{ matrix.qt_version }}' + arch: '${{ matrix.qt_arch }}' - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} diff --git a/.github/workflows/utests.yml b/.github/workflows/utests.yml index 407e708..bc84c7b 100644 --- a/.github/workflows/utests.yml +++ b/.github/workflows/utests.yml @@ -11,6 +11,14 @@ env: jobs: build: + strategy: + matrix: + include: + - qt_version: '6.6' + qt_arch: 'gcc_64' + - qt_version: '6.7' + qt_arch: 'linux_gcc_64' + runs-on: ubuntu-latest steps: @@ -26,7 +34,8 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: '6.6.*' + version: '${{ matrix.qt_version }}' + arch: '${{ matrix.qt_arch }}' - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSCRATCHCPPRENDER_BUILD_UNIT_TESTS=ON