From 982133d9b60f6dcb0aabee7d75cc03c3c56a038c Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 23 Sep 2021 12:38:52 +0800 Subject: [PATCH] CI: Clean up scripts * Remove redundant dependencies * Replace ccache action provider * Let coverity-scan script build with libtorrent v2.0.4. PR #15483. --- .github/workflows/ci_macos.yaml | 12 +++++------- .github/workflows/ci_ubuntu.yaml | 17 +++++++---------- .github/workflows/coverity-scan.yml | 21 +++++++-------------- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml index ba4a582a9..d9c3b5270 100644 --- a/.github/workflows/ci_macos.yaml +++ b/.github/workflows/ci_macos.yaml @@ -19,11 +19,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1 - with: - key: ${{ runner.os }} - - name: Install dependencies run: | 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/plugins /usr/local/plugins + - name: Setup ccache + uses: Chocobo1/setup-ccache-action@v1 + with: + update_packager_index: false + - name: Install libtorrent run: | git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git cd libtorrent git submodule update --init --recursive - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" cmake \ -B build \ -G "Ninja" \ @@ -54,7 +53,6 @@ jobs: - name: Build qBittorrent run: | - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" cmake \ -B build \ -G "Ninja" \ diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml index 9a6597554..d00c976ac 100644 --- a/.github/workflows/ci_ubuntu.yaml +++ b/.github/workflows/ci_ubuntu.yaml @@ -16,20 +16,19 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Setup ccache - uses: hendrikmuhs/ccache-action@v1 - with: - key: ${{ runner.os }} - - name: Install dependencies run: | sudo apt update sudo apt install \ - build-essential cmake git ninja-build pkg-config \ - libssl-dev libgeoip-dev zlib1g-dev \ - libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev + build-essential cmake ninja-build pkg-config \ + 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... + - 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 # to speed up the process, only the required components are installed rather than the full qt515-meta-full metapackage - name: Install Qt @@ -43,7 +42,6 @@ jobs: git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git cd libtorrent git submodule update --init --recursive - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" cmake \ -B build \ -G "Ninja" \ @@ -56,7 +54,6 @@ jobs: - name: Build qBittorrent run: | - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" cmake \ -B build \ -G "Ninja" \ diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index f721659a7..015ab7b4a 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -5,9 +5,6 @@ on: - cron: '0 0 1 * *' # Monthly (1st day of month at midnight) workflow_dispatch: # Mainly for testing. Don't forget the Coverity usage limits. -env: - LIBTORRENT_VERSION_TAG: v1.2.14 - jobs: coverity_scan: name: Scan @@ -20,8 +17,8 @@ jobs: run: | sudo apt update sudo apt install \ - build-essential cmake git ninja-build pkg-config \ - libssl-dev zlib1g-dev libboost-dev libboost-system-dev + build-essential cmake ninja-build pkg-config \ + 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... # this will be installed under /opt/qt515. CMake will still find it automatically without additional hints @@ -34,28 +31,26 @@ jobs: - name: Install libtorrent run: | - git clone https://github.com/arvidn/libtorrent + git clone --branch v2.0.4 --depth 1 https://github.com/arvidn/libtorrent.git cd libtorrent - git checkout ${{ env.LIBTORRENT_VERSION_TAG }} + git submodule update --init --recursive cmake \ -B build \ -G "Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -Ddeprecated-functions=OFF cmake --build build - sudo cmake --install build --prefix /usr/local + sudo cmake --install build - name: Download Coverity Build Tool run: | wget \ -q \ 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 mkdir coverity_tool tar xzf coverity_tool.tgz --strip 1 -C coverity_tool - env: - TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} - name: Configure qBittorrent run: | @@ -75,11 +70,9 @@ jobs: run: | tar caf qbittorrent.xz cov-int curl \ - --form token=$TOKEN \ + --form token="${{ secrets.COVERITY_SCAN_TOKEN }}" \ --form email=sledgehammer999@qbittorrent.org \ --form file=@qbittorrent.xz \ --form version="$(git rev-parse --short HEAD)" \ --form description="master" \ https://scan.coverity.com/builds?project=qbittorrent%2FqBittorrent - env: - TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}