Merge pull request #15749 from Chocobo1/ci

GHA CI: Simplify commands

.appveyor.yml

@@ -42,7 +42,7 @@ install:
 
 before_build:
   # setup env
-  - CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+  - CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
   - SET PATH=%PATH%;C:\Qt\5.15.2\msvc2019_64\bin;%CACHE_DIR%\jom
   # setup project
   - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"

.github/workflows/ci_macos.yaml

@@ -42,9 +42,12 @@ jobs:
 
       - name: Install libtorrent
         run: |
-          git clone --branch v${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone \
+            --branch v${{ matrix.libt_version }} \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          git submodule update --init --recursive
           cmake \
             -B build \
             -G "Ninja" \
@@ -65,7 +68,6 @@ jobs:
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
-            -DQt5_DIR="$Qt5_DIR" \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
           cmake --build build
@@ -80,7 +82,6 @@ jobs:
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
             -DQT6=ON \
-            -DQt6_DIR="$Qt6_DIR" \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
           cmake --build build

.github/workflows/ci_ubuntu.yaml

@@ -41,9 +41,12 @@ jobs:
 
       - name: Install libtorrent
         run: |
-          git clone --branch v${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone \
+            --branch v${{ matrix.libt_version }} \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          git submodule update --init --recursive
           cmake \
             -B build \
             -G "Ninja" \
@@ -62,7 +65,6 @@ jobs:
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DCMAKE_INSTALL_PREFIX="/usr" \
-            -DQt5_DIR="$Qt5_DIR" \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
           cmake --build build
@@ -78,7 +80,6 @@ jobs:
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -DCMAKE_INSTALL_PREFIX="/usr" \
             -DQT6=ON \
-            -DQt6_DIR="$Qt6_DIR" \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
           cmake --build build

.github/workflows/ci_windows.yaml

@@ -78,9 +78,12 @@ jobs:
 
       - name: Install libtorrent
         run: |
-          git clone --branch v${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone `
+            --branch v${{ matrix.libt_version }} `
+            --depth 1 `
+            --recurse-submodules `
+            https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          git submodule update --init --recursive
           cmake `
             -B build `
             -G "Ninja" `

.github/workflows/coverity-scan.yml

@@ -15,21 +15,28 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
           sudo apt update
           sudo apt install \
             build-essential cmake ninja-build pkg-config \
-            libboost-dev libssl-dev qt515base qt515svg qt515tools zlib1g-dev
+            libboost-dev libssl-dev zlib1g-dev
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: "5.15.2"
 
       - name: Install libtorrent
         run: |
-          git clone --branch v2.0.4 --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone \
+            --branch "v2.0.4" \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          git submodule update --init --recursive
           cmake \
             -B build \
             -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -Ddeprecated-functions=OFF
           cmake --build build
           sudo cmake --install build
@@ -49,7 +56,7 @@ jobs:
           cmake \
             -B build \
             -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DGUI=ON \
             -DVERBOSE_CONFIGURE=ON
           export PATH="$(pwd)/coverity_tool/bin:$PATH"