From 9ed6aee1c4d0d54bf60a4208202727f5118965f5 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 20 Feb 2024 07:58:16 +0100 Subject: [PATCH] C++ package: use Qt on Linux, not on Windows/Mac Commit 4b4a7d6ff2d1927ca53bd5be7fdf4f5bf15a8e63 attempted to remove the Qt from the C++ package on Windows, but infortunately, it removed the setup of Qt on Linux instead of Windows. As a result, 1.4.x binary packages on Linux are not build with Qt, and on Windows are build with Qt but no longer ship Qt so are broken In the master branch we no longer use Qt by default already on Windows even if it is installed. But this patch restore the fact that the binary package are built with Qt on Linux (cherry picked from commit c399447c932dc74be3165a8f670285d4671e5845) --- .github/workflows/cpp_package.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index 7448d94c1fd2..3157c055f03b 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -27,11 +27,11 @@ jobs: - uses: ./.github/actions/install-linux-dependencies with: old-ubuntu: true - - name: Install Qt (cached) - if: matrix.os != 'ubuntu-20.04' + - name: Install Qt (Ubuntu) + if: matrix.os == 'ubuntu-20.04' uses: jurplel/install-qt-action@v3 with: - version: 6.5.1 + version: 5.15.2 cache: true - uses: ./.github/actions/setup-rust - uses: baptiste0928/cargo-install@v2