diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml index fe177d4fc..b3a772248 100644 --- a/.github/workflows/ci_macos.yaml +++ b/.github/workflows/ci_macos.yaml @@ -18,7 +18,15 @@ jobs: strategy: fail-fast: false matrix: - libt_version: ["2.0.11", "1.2.20"] + libtorrent: + - version: "2.0.11" + boost_major_version: "1" + boost_minor_version: "90" + boost_patch_version: "0" + - version: "1.2.20" + boost_major_version: "1" + boost_minor_version: "86" + boost_patch_version: "0" qbt_gui: ["GUI=ON", "GUI=OFF"] qt_version: ["6.10.1"] @@ -55,13 +63,9 @@ jobs: max_size=1G - name: Install boost - env: - BOOST_MAJOR_VERSION: "1" - BOOST_MINOR_VERSION: ${{ startsWith(matrix.libt_version, '2') && '90' || '86' }} - BOOST_PATCH_VERSION: ${{ startsWith(matrix.libt_version, '2') && '0' || '0' }} run: | - boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" - boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" + boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" + boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" set +e curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url" tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?" @@ -86,7 +90,7 @@ jobs: - name: Install libtorrent run: | git clone \ - --branch v${{ matrix.libt_version }} \ + --branch v${{ matrix.libtorrent.version }} \ --depth 1 \ --recurse-submodules \ https://github.com/arvidn/libtorrent.git \ @@ -164,5 +168,5 @@ jobs: - name: Upload build artifacts uses: actions/upload-artifact@v5 with: - name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }} + name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libtorrent.version }}_Qt-${{ matrix.qt_version }} path: upload diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml index 7ff4ec5e5..71d331a7f 100644 --- a/.github/workflows/ci_ubuntu.yaml +++ b/.github/workflows/ci_ubuntu.yaml @@ -19,7 +19,15 @@ jobs: strategy: fail-fast: false matrix: - libt_version: ["2.0.11", "1.2.20"] + libtorrent: + - version: "2.0.11" + boost_major_version: "1" + boost_minor_version: "77" + boost_patch_version: "0" + - version: "1.2.20" + boost_major_version: "1" + boost_minor_version: "77" + boost_patch_version: "0" qbt_gui: ["GUI=ON", "GUI=OFF"] qt_version: ["6.6.3"] @@ -50,13 +58,9 @@ jobs: max_size=1G - name: Install boost - env: - BOOST_MAJOR_VERSION: "1" - BOOST_MINOR_VERSION: "77" - BOOST_PATCH_VERSION: "0" run: | - boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" - boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" + boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" + boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" set +e curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url" tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?" @@ -80,7 +84,7 @@ jobs: - name: Install libtorrent run: | git clone \ - --branch v${{ matrix.libt_version }} \ + --branch v${{ matrix.libtorrent.version }} \ --depth 1 \ --recurse-submodules \ https://github.com/arvidn/libtorrent.git \ @@ -102,7 +106,7 @@ jobs: # to avoid scanning 3rdparty codebases, initialize it just before building qbt - name: Initialize CodeQL uses: github/codeql-action/init@v4 - if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') + if: startsWith(matrix.libtorrent.version, 2) && (matrix.qbt_gui == 'GUI=ON') with: config-file: ./.github/workflows/helper/codeql/cpp.yaml languages: cpp @@ -133,7 +137,7 @@ jobs: - name: Run CodeQL analysis uses: github/codeql-action/analyze@v4 - if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') + if: startsWith(matrix.libtorrent.version, 2) && (matrix.qbt_gui == 'GUI=ON') with: category: ${{ github.base_ref || github.ref_name }} @@ -180,5 +184,5 @@ jobs: - name: Upload build artifacts uses: actions/upload-artifact@v5 with: - name: qBittorrent-CI_Ubuntu-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }} + name: qBittorrent-CI_Ubuntu-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libtorrent.version }}_Qt-${{ matrix.qt_version }} path: upload diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index fba52bc9b..914401ead 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -10,7 +10,7 @@ concurrency: jobs: ci: - name: Build (${{ matrix.libt_version }}, ${{ matrix.config.arch }}) + name: Build (${{ matrix.libtorrent.version }}, ${{ matrix.config.arch }}) runs-on: ${{ matrix.config.os }} permissions: actions: write @@ -18,7 +18,15 @@ jobs: strategy: fail-fast: false matrix: - libt_version: ["2.0.11", "1.2.20"] + libtorrent: + - version: "2.0.11" + boost_major_version: "1" + boost_minor_version: "90" + boost_patch_version: "0" + - version: "1.2.20" + boost_major_version: "1" + boost_minor_version: "86" + boost_patch_version: "0" config: - os: windows-latest arch: x64 @@ -86,13 +94,9 @@ jobs: $packages - name: Install boost - env: - BOOST_MAJOR_VERSION: "1" - BOOST_MINOR_VERSION: ${{ startsWith(matrix.libt_version, '2') && '90' || '86' }} - BOOST_PATCH_VERSION: ${{ startsWith(matrix.libt_version, '2') && '0' || '0' }} run: | - $boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" - $boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" + $boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" + $boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url" tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.." if ($LastExitCode -ne 0) @@ -121,7 +125,7 @@ jobs: - name: Install libtorrent run: | git clone ` - --branch v${{ matrix.libt_version }} ` + --branch v${{ matrix.libtorrent.version }} ` --depth 1 ` --recurse-submodules ` https://github.com/arvidn/libtorrent.git ` @@ -211,7 +215,7 @@ jobs: - name: Upload build artifacts uses: actions/upload-artifact@v5 with: - name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libt_version }} + name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libtorrent.version }} path: upload - name: Install NSIS @@ -227,5 +231,5 @@ jobs: - name: Upload installer uses: actions/upload-artifact@v5 with: - name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libt_version }}-setup + name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libtorrent.version }}-setup path: dist/windows/qbittorrent_*_setup.exe diff --git a/.github/workflows/coverity-scan.yaml b/.github/workflows/coverity-scan.yaml index 6dff68d83..9411cf856 100644 --- a/.github/workflows/coverity-scan.yaml +++ b/.github/workflows/coverity-scan.yaml @@ -14,7 +14,11 @@ jobs: strategy: matrix: - libt_version: ["2.0.11"] + libtorrent: + - version: "2.0.11" + boost_major_version: "1" + boost_minor_version: "90" + boost_patch_version: "0" qbt_gui: ["GUI=ON"] qt_version: ["6.10.1"] @@ -37,13 +41,9 @@ jobs: libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev - name: Install boost - env: - BOOST_MAJOR_VERSION: "1" - BOOST_MINOR_VERSION: "90" - BOOST_PATCH_VERSION: "0" run: | - boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" - boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz" + boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" + boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz" set +e curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url" tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?" @@ -66,7 +66,7 @@ jobs: - name: Install libtorrent run: | git clone \ - --branch v${{ matrix.libt_version }} \ + --branch v${{ matrix.libtorrent.version }} \ --depth 1 \ --recurse-submodules \ https://github.com/arvidn/libtorrent.git \