From dcc5206e3d14f3b6f76320ac6d7df12f1e4ac36b Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sat, 1 Oct 2022 21:54:15 +0800 Subject: [PATCH 1/2] GHA CI: only install required Qt components So it won't waste time download/install unused Qt components. --- .github/workflows/ci_macos.yaml | 2 ++ .github/workflows/ci_ubuntu.yaml | 1 + .github/workflows/ci_windows.yaml | 1 + .github/workflows/coverity-scan.yml | 1 + 4 files changed, 5 insertions(+) diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml index 416ff5024..59c3a8ca6 100644 --- a/.github/workflows/ci_macos.yaml +++ b/.github/workflows/ci_macos.yaml @@ -54,6 +54,8 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt_version }} + archives: qtbase qtdeclarative qtsvg qttools + # Not sure why Qt made a hard dependency on qtdeclarative, try removing it when Qt > 6.4.0 - name: Install libtorrent run: | diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml index 5e060bb4d..5e76c639c 100644 --- a/.github/workflows/ci_ubuntu.yaml +++ b/.github/workflows/ci_ubuntu.yaml @@ -43,6 +43,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: ${{ matrix.qt_version }} + archives: icu qtbase qtsvg qttools - name: Install libtorrent run: | diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index 3facbc4a1..dacdb3105 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -77,6 +77,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: "6.4.0" + archives: qtbase qtsvg qttools - name: Install libtorrent run: | diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 3848bf211..2f294a1a1 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -25,6 +25,7 @@ jobs: uses: jurplel/install-qt-action@v3 with: version: "6.3.0" + archives: qtbase qtsvg qttools - name: Install libtorrent run: | From 8b4a0da2354973837e4bb4f5eb442017e4a3e203 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Mon, 3 Oct 2022 12:02:10 +0800 Subject: [PATCH 2/2] GHA CI: bump Qt version to 6.4.0 --- .github/workflows/coverity-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 2f294a1a1..b7effcf5c 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -24,7 +24,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: "6.3.0" + version: "6.4.0" archives: qtbase qtsvg qttools - name: Install libtorrent