GHA CI: Build with Qt 6.5/6.6/6.7/6.8 Series

xavier2k6 · Nov 8, 2024 · 508c52b · 508c52b
1 parent 33e3fb2
commit 508c52b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 468 deletions.
diff --git a/.github/workflows/ci_file_health.yaml b/.github/workflows/ci_file_health.yaml
@@ -32,7 +32,7 @@ jobs:
           curl \
             -L \
             -o "${{ runner.temp }}/pandoc.tar.gz" \
-            "https://github.com/jgm/pandoc/releases/download/3.4/pandoc-3.4-linux-amd64.tar.gz"
+            "https://github.com/jgm/pandoc/releases/download/3.5/pandoc-3.5-linux-amd64.tar.gz"
           tar -xf "${{ runner.temp }}/pandoc.tar.gz" -C "${{ github.workspace }}/.."
           mv "${{ github.workspace }}/.."/pandoc-* "${{ env.pandoc_path }}"
           # run pandoc

diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
@@ -17,7 +17,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.10", "1.2.19"]
+        libt_version: ["RC_2_0"]
+        qt_version: ["6.5.0", "6.5.1", "6.5.2", "6.5.3", "6.6.0", "6.6.1", "6.6.2", "6.6.3", "6.7.0", "6.7.1", "6.7.2", "6.7.3", "6.8.0"]
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -95,15 +96,16 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.8.0"
-          arch: win64_msvc2022_64
+          py7zrversion: '>=0.22.0'
+          aqtversion: '>=3.1.18'
+          version: ${{ matrix.qt_version }}
           archives: qtbase qtsvg qttools
           cache: true
 
       - name: Install libtorrent
         run: |
           git clone `
-            --branch v${{ matrix.libt_version }} `
+            --branch ${{ matrix.libt_version }} `
             --depth 1 `
             --recurse-submodules `
             https://github.com/arvidn/libtorrent.git `
@@ -171,7 +173,7 @@ jobs:
           mkdir upload/qBittorrent/plugins/sqldrivers
           copy "${{ env.Qt_ROOT_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/qBittorrent/plugins/sqldrivers
           mkdir upload/qBittorrent/plugins/styles
-          copy "${{ env.Qt_ROOT_DIR }}/plugins/styles/qmodernwindowsstyle.dll" upload/qBittorrent/plugins/styles
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/styles/q*style.dll" upload/qBittorrent/plugins/styles
           mkdir upload/qBittorrent/plugins/tls
           copy "${{ env.Qt_ROOT_DIR }}/plugins/tls/qschannelbackend.dll" upload/qBittorrent/plugins/tls
           # cmake additionals
@@ -184,7 +186,7 @@ jobs:
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: qBittorrent-CI_Windows-x64_libtorrent-${{ matrix.libt_version }}
+          name: qBittorrent-CI_Windows-x64_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
           path: upload
 
       - name: Create installer