From 5b0706df65e56626b05707265f89f604428481f2 Mon Sep 17 00:00:00 2001 From: xavier2k6 <42386382+xavier2k6@users.noreply.github.com> Date: Thu, 27 Jul 2023 15:45:26 +0100 Subject: [PATCH] GHA CI: Bump Qt version to 6.5.2 PR #19378. --- .github/workflows/ci_macos.yaml | 5 +---- .github/workflows/ci_ubuntu.yaml | 9 +++------ .github/workflows/ci_windows.yaml | 2 +- .github/workflows/coverity-scan.yaml | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml index df5ef3212..20d9f550f 100644 --- a/.github/workflows/ci_macos.yaml +++ b/.github/workflows/ci_macos.yaml @@ -19,10 +19,7 @@ jobs: matrix: libt_version: ["2.0.9", "1.2.19"] qbt_gui: ["GUI=ON", "GUI=OFF"] - qt_version: ["6.5.0"] - exclude: - - libt_version: "1.2.19" - qt_version: "6.5.0" + qt_version: ["6.5.2"] env: boost_path: "${{ github.workspace }}/../boost" diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml index e43521336..e19ea90e8 100644 --- a/.github/workflows/ci_ubuntu.yaml +++ b/.github/workflows/ci_ubuntu.yaml @@ -20,10 +20,7 @@ jobs: matrix: libt_version: ["2.0.9", "1.2.19"] qbt_gui: ["GUI=ON", "GUI=OFF"] - qt_version: ["6.2.0"] - exclude: - - libt_version: "1.2.19" - qt_version: "6.2.0" + qt_version: ["6.5.2"] steps: - name: Checkout repository @@ -34,7 +31,7 @@ jobs: sudo apt update sudo apt install \ build-essential cmake ninja-build pkg-config \ - libboost-dev libssl-dev libxkbcommon-x11-dev zlib1g-dev + libboost-dev libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev - name: Setup ccache uses: Chocobo1/setup-ccache-action@v1 @@ -47,7 +44,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt_version }} - archives: icu qtbase qtsvg qttools + archives: icu qtbase qtdeclarative qtsvg qttools - name: Install libtorrent run: | diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index 8f12141a2..b6456e86d 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -79,7 +79,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: "6.5.0" + version: "6.5.2" archives: qtbase qtsvg qttools - name: Install libtorrent diff --git a/.github/workflows/coverity-scan.yaml b/.github/workflows/coverity-scan.yaml index 74b91dea8..c2b58a4c8 100644 --- a/.github/workflows/coverity-scan.yaml +++ b/.github/workflows/coverity-scan.yaml @@ -26,7 +26,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: "6.5.0" + version: "6.5.2" archives: icu qtbase qtsvg qttools - name: Install libtorrent