mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-11 15:27:54 +00:00
CI: Clean up scripts
* Remove redundant dependencies * Replace ccache action provider * Let coverity-scan script build with libtorrent v2.0.4. PR #15483.
This commit is contained in:
parent
d23935a269
commit
982133d9b6
12
.github/workflows/ci_macos.yaml
vendored
12
.github/workflows/ci_macos.yaml
vendored
@ -19,11 +19,6 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Setup ccache
|
|
||||||
uses: hendrikmuhs/ccache-action@v1
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
brew update > /dev/null
|
brew update > /dev/null
|
||||||
@ -36,12 +31,16 @@ jobs:
|
|||||||
sudo ln -s /usr/local/opt/qt@5/mkspecs /usr/local/mkspecs
|
sudo ln -s /usr/local/opt/qt@5/mkspecs /usr/local/mkspecs
|
||||||
sudo ln -s /usr/local/opt/qt@5/plugins /usr/local/plugins
|
sudo ln -s /usr/local/opt/qt@5/plugins /usr/local/plugins
|
||||||
|
|
||||||
|
- name: Setup ccache
|
||||||
|
uses: Chocobo1/setup-ccache-action@v1
|
||||||
|
with:
|
||||||
|
update_packager_index: false
|
||||||
|
|
||||||
- name: Install libtorrent
|
- name: Install libtorrent
|
||||||
run: |
|
run: |
|
||||||
git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
|
git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
|
||||||
cd libtorrent
|
cd libtorrent
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
||||||
cmake \
|
cmake \
|
||||||
-B build \
|
-B build \
|
||||||
-G "Ninja" \
|
-G "Ninja" \
|
||||||
@ -54,7 +53,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Build qBittorrent
|
- name: Build qBittorrent
|
||||||
run: |
|
run: |
|
||||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
||||||
cmake \
|
cmake \
|
||||||
-B build \
|
-B build \
|
||||||
-G "Ninja" \
|
-G "Ninja" \
|
||||||
|
17
.github/workflows/ci_ubuntu.yaml
vendored
17
.github/workflows/ci_ubuntu.yaml
vendored
@ -16,20 +16,19 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Setup ccache
|
|
||||||
uses: hendrikmuhs/ccache-action@v1
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}
|
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install \
|
sudo apt install \
|
||||||
build-essential cmake git ninja-build pkg-config \
|
build-essential cmake ninja-build pkg-config \
|
||||||
libssl-dev libgeoip-dev zlib1g-dev \
|
libboost-dev libssl-dev zlib1g-dev
|
||||||
libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev
|
|
||||||
# sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
|
# sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
|
||||||
|
|
||||||
|
- name: Setup ccache
|
||||||
|
uses: Chocobo1/setup-ccache-action@v1
|
||||||
|
with:
|
||||||
|
update_packager_index: false
|
||||||
|
|
||||||
# this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
|
# this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
|
||||||
# to speed up the process, only the required components are installed rather than the full qt515-meta-full metapackage
|
# to speed up the process, only the required components are installed rather than the full qt515-meta-full metapackage
|
||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
@ -43,7 +42,6 @@ jobs:
|
|||||||
git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
|
git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
|
||||||
cd libtorrent
|
cd libtorrent
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
||||||
cmake \
|
cmake \
|
||||||
-B build \
|
-B build \
|
||||||
-G "Ninja" \
|
-G "Ninja" \
|
||||||
@ -56,7 +54,6 @@ jobs:
|
|||||||
|
|
||||||
- name: Build qBittorrent
|
- name: Build qBittorrent
|
||||||
run: |
|
run: |
|
||||||
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
|
|
||||||
cmake \
|
cmake \
|
||||||
-B build \
|
-B build \
|
||||||
-G "Ninja" \
|
-G "Ninja" \
|
||||||
|
21
.github/workflows/coverity-scan.yml
vendored
21
.github/workflows/coverity-scan.yml
vendored
@ -5,9 +5,6 @@ on:
|
|||||||
- cron: '0 0 1 * *' # Monthly (1st day of month at midnight)
|
- cron: '0 0 1 * *' # Monthly (1st day of month at midnight)
|
||||||
workflow_dispatch: # Mainly for testing. Don't forget the Coverity usage limits.
|
workflow_dispatch: # Mainly for testing. Don't forget the Coverity usage limits.
|
||||||
|
|
||||||
env:
|
|
||||||
LIBTORRENT_VERSION_TAG: v1.2.14
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
coverity_scan:
|
coverity_scan:
|
||||||
name: Scan
|
name: Scan
|
||||||
@ -20,8 +17,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
sudo apt update
|
sudo apt update
|
||||||
sudo apt install \
|
sudo apt install \
|
||||||
build-essential cmake git ninja-build pkg-config \
|
build-essential cmake ninja-build pkg-config \
|
||||||
libssl-dev zlib1g-dev libboost-dev libboost-system-dev
|
libboost-dev libssl-dev zlib1g-dev
|
||||||
# sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
|
# sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
|
||||||
|
|
||||||
# this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
|
# this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
|
||||||
@ -34,28 +31,26 @@ jobs:
|
|||||||
|
|
||||||
- name: Install libtorrent
|
- name: Install libtorrent
|
||||||
run: |
|
run: |
|
||||||
git clone https://github.com/arvidn/libtorrent
|
git clone --branch v2.0.4 --depth 1 https://github.com/arvidn/libtorrent.git
|
||||||
cd libtorrent
|
cd libtorrent
|
||||||
git checkout ${{ env.LIBTORRENT_VERSION_TAG }}
|
git submodule update --init --recursive
|
||||||
cmake \
|
cmake \
|
||||||
-B build \
|
-B build \
|
||||||
-G "Ninja" \
|
-G "Ninja" \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-Ddeprecated-functions=OFF
|
-Ddeprecated-functions=OFF
|
||||||
cmake --build build
|
cmake --build build
|
||||||
sudo cmake --install build --prefix /usr/local
|
sudo cmake --install build
|
||||||
|
|
||||||
- name: Download Coverity Build Tool
|
- name: Download Coverity Build Tool
|
||||||
run: |
|
run: |
|
||||||
wget \
|
wget \
|
||||||
-q \
|
-q \
|
||||||
https://scan.coverity.com/download/linux64 \
|
https://scan.coverity.com/download/linux64 \
|
||||||
--post-data "token=$TOKEN&project=qbittorrent%2FqBittorrent" \
|
--post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=qbittorrent%2FqBittorrent" \
|
||||||
-O coverity_tool.tgz
|
-O coverity_tool.tgz
|
||||||
mkdir coverity_tool
|
mkdir coverity_tool
|
||||||
tar xzf coverity_tool.tgz --strip 1 -C coverity_tool
|
tar xzf coverity_tool.tgz --strip 1 -C coverity_tool
|
||||||
env:
|
|
||||||
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
|
|
||||||
|
|
||||||
- name: Configure qBittorrent
|
- name: Configure qBittorrent
|
||||||
run: |
|
run: |
|
||||||
@ -75,11 +70,9 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
tar caf qbittorrent.xz cov-int
|
tar caf qbittorrent.xz cov-int
|
||||||
curl \
|
curl \
|
||||||
--form token=$TOKEN \
|
--form token="${{ secrets.COVERITY_SCAN_TOKEN }}" \
|
||||||
--form email=sledgehammer999@qbittorrent.org \
|
--form email=sledgehammer999@qbittorrent.org \
|
||||||
--form file=@qbittorrent.xz \
|
--form file=@qbittorrent.xz \
|
||||||
--form version="$(git rev-parse --short HEAD)" \
|
--form version="$(git rev-parse --short HEAD)" \
|
||||||
--form description="master" \
|
--form description="master" \
|
||||||
https://scan.coverity.com/builds?project=qbittorrent%2FqBittorrent
|
https://scan.coverity.com/builds?project=qbittorrent%2FqBittorrent
|
||||||
env:
|
|
||||||
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user