diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a4d07717..48433029c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,15 +150,24 @@ jobs: - name: Install Qt5 if: startsWith(matrix.qt-version, '5.') - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v4.0.0 with: cache: true cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 version: ${{ matrix.qt-version }} + - name: Install Qt6 + if: startsWith(matrix.qt-version, '6.') + uses: jurplel/install-qt-action@v4.0.0 + with: + cache: true + cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 + modules: qt5compat qtimageformats + version: ${{ matrix.qt-version }} + - name: Install Qt 6.5.3 imageformats if: startsWith(matrix.qt-version, '6.') - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v4.0.0 with: cache: false modules: qtimageformats @@ -176,15 +185,6 @@ jobs: cd plugins/imageformats echo "PLUGIN_PATH=$(pwd)" | Out-File -Path "$Env:GITHUB_OUTPUT" -Encoding ASCII - - name: Install Qt6 - if: startsWith(matrix.qt-version, '6.') - uses: jurplel/install-qt-action@v3.3.0 - with: - cache: true - cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 - modules: qt5compat qtimageformats - version: ${{ matrix.qt-version }} - # WINDOWS - name: Enable Developer Command Prompt (Windows) if: startsWith(matrix.os, 'windows') diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 785fb5932..19052648b 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -29,7 +29,7 @@ jobs: - name: Install Qt6 if: startsWith(matrix.qt-version, '6.') - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v4.0.0 with: cache: true cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index d606c8708..b22766e09 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -47,7 +47,7 @@ jobs: fetch-depth: 0 # allows for tags access - name: Install Qt - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v4.0.0 with: cache: true cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 0b73ee84f..8038d1aca 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -57,7 +57,7 @@ jobs: fetch-depth: 0 # allows for tags access - name: Install Qt - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v4.0.0 with: cache: true cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2