Skip to content

Support libtorrent v2.0.4 in CI #15340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Chocobo1 merged 4 commits into from
Aug 19, 2021
Merged

Support libtorrent v2.0.4 in CI #15340

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
793e864
GHA CI: Support libtorrent v2.0.4
Chocobo1 Aug 18, 2021
69f7f23
GHA CI: Remove OS variable from build matrix
Chocobo1 Aug 18, 2021
00d2997
GHA CI: Move global environment variables out
Chocobo1 Aug 18, 2021
8799321
GHA CI: Use ccache
Chocobo1 Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,25 @@ on: [pull_request, push]

env:
VCPKG_COMMIT: 8dddc6c899ce6fdbeab38b525a31e7f23cb2d5bb
VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg
VCPKG_DEST_WIN: C:\qbt_tools\vcpkg
LIBTORRENT_VERSION_TAG: v1.2.14

jobs:
ubuntu:
name: Ubuntu
runs-on: ubuntu-20.04

strategy:
matrix:
os: [ubuntu-20.04]
qbt_gui: ["GUI=ON", "GUI=OFF"]
libt_version: ["v2.0.4", "v1.2.14"]
fail-fast: false

runs-on: ${{ matrix.os }}

defaults:
run:
shell: bash

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Setup ccache
uses: hendrikmuhs/ccache-action@v1

- name: Install dependencies
run: |
sudo apt update
Expand All @@ -51,9 +46,10 @@ jobs:

- name: Install libtorrent
run: |
git clone https://github.com/arvidn/libtorrent
git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
cd libtorrent
git checkout ${{ env.LIBTORRENT_VERSION_TAG }}
git submodule update --init --recursive
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
cmake \
-B build \
-G "Ninja" \
Expand All @@ -66,6 +62,7 @@ jobs:

- name: Build qBittorrent
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
cmake \
-B build \
-G "Ninja" \
Expand All @@ -82,7 +79,7 @@ jobs:
- name: Upload build artifacts
uses: actions/upload-artifact@v2
with:
name: qBittorrent-CI_${{ matrix.os }}-x64_${{ matrix.qbt_gui }}
name: qBittorrent-CI_ubuntu-20.04-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}
path: |
build/compile_commands.json
build/install_manifest.txt
Expand All @@ -96,6 +93,9 @@ jobs:
name: Windows
runs-on: windows-2019

env:
VCPKG_DEST_WIN: C:\qbt_tools\vcpkg

defaults:
run:
shell: pwsh
Expand Down Expand Up @@ -189,6 +189,9 @@ jobs:
qbt_gui: ["GUI=ON", "GUI=OFF"]
fail-fast: false

env:
VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg

defaults:
run:
shell: pwsh
Expand Down