From a54772bf35abd0eca5a3829c5d40c4ba2ca62e68 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 17 Nov 2021 12:02:42 +0800 Subject: [PATCH 1/2] Appveyor CI: Upload built artifacts --- .appveyor.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 5f465ac7d..fb3471120 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -56,4 +56,38 @@ build_script: - qmake qbittorrent.pro && cd src && qmake src.pro - jom -j2 -f Makefile.Release +after_build: + - cd "%REPO_DIR%" + - MKDIR upload + - COPY dist\windows\qt.conf upload + - COPY src\release\qbittorrent.exe upload + - COPY src\release\qbittorrent.pdb upload + - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.dll" upload + - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload + - COPY "%CACHE_DIR%\base\lib\torrent-rasterbar.dll" upload + - COPY "%CACHE_DIR%\base\lib\zlib1.dll" upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Core.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Gui.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Network.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Sql.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Svg.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Widgets.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5WinExtras.dll upload + - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Xml.dll upload + - MKDIR upload\plugins\iconengines + - COPY C:\Qt\5.15.2\msvc2019_64\plugins\iconengines\qsvgicon.dll upload\plugins\iconengines + - MKDIR upload\plugins\imageformats + - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qico.dll upload\plugins\imageformats + - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qsvg.dll upload\plugins\imageformats + - MKDIR upload\plugins\platforms + - COPY C:\Qt\5.15.2\msvc2019_64\plugins\platforms\qwindows.dll upload\plugins\platforms + - MKDIR upload\plugins\sqldrivers + - COPY C:\Qt\5.15.2\msvc2019_64\plugins\sqldrivers\qsqlite.dll upload\plugins\sqldrivers + - MKDIR upload\plugins\styles + - COPY C:\Qt\5.15.2\msvc2019_64\plugins\styles\qwindowsvistastyle.dll upload\plugins\styles + test: off + +artifacts: + - path: upload + name: qBittorrent-Appveyor_Windows-x64 From 67c45efff730db2f9f0524e7cb65e3dfdfdc0456 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 17 Nov 2021 12:34:12 +0800 Subject: [PATCH 2/2] GHA CI: Use prebuilt Qt library --- .github/workflows/ci_windows.yaml | 39 +++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index ffec868af..47dc8bb83 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -35,9 +35,9 @@ jobs: doNotUpdateVcpkg: true # the preinstalled vcpkg is updated regularly setupOnly: true - # tell vcpkg to only build Release variants of the dependencies - - name: Configure vcpkg triplet overlay + - name: Install dependencies from vcpkg run: | + # tell vcpkg to only build Release variants of the dependencies New-Item ` -Path "${{ github.workspace }}" ` -Name "triplets_overlay" ` @@ -48,16 +48,9 @@ jobs: Add-Content ` "${{ github.workspace }}/triplets_overlay/x64-windows-static-release.cmake" ` -Value "set(VCPKG_BUILD_TYPE release)" - - # clear buildtrees after each package installation to reduce disk space requirements - - name: Install dependencies - run: | + # clear buildtrees after each package installation to reduce disk space requirements $packages = ` "openssl:x64-windows-static-release", - "qt5-base:x64-windows-static-release", - "qt5-svg:x64-windows-static-release", - "qt5-tools:x64-windows-static-release", - "qt5-winextras:x64-windows-static-release", "zlib:x64-windows-static-release" ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade ` --overlay-triplets="${{ github.workspace }}/triplets_overlay" ` @@ -76,6 +69,11 @@ jobs: 7z x "${{ runner.temp }}/boost.7z" -o"${{ github.workspace }}/.." move "${{ github.workspace }}/../boost_*" "${{ env.boost_path }}" + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + version: "5.15.2" + - name: Install libtorrent run: | git clone ` @@ -121,6 +119,27 @@ jobs: copy build/qbittorrent.exe upload copy build/qbittorrent.pdb upload copy dist/windows/qt.conf upload + # runtimes + copy "${{ env.Qt5_DIR }}/bin/Qt5Core.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5Gui.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5Network.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5Sql.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5Svg.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5Widgets.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5WinExtras.dll" upload + copy "${{ env.Qt5_DIR }}/bin/Qt5Xml.dll" upload + mkdir upload/plugins/iconengines + copy "${{ env.Qt5_DIR }}/plugins/iconengines/qsvgicon.dll" upload/plugins/iconengines + mkdir upload/plugins/imageformats + copy "${{ env.Qt5_DIR }}/plugins/imageformats/qico.dll" upload/plugins/imageformats + copy "${{ env.Qt5_DIR }}/plugins/imageformats/qsvg.dll" upload/plugins/imageformats + mkdir upload/plugins/platforms + copy "${{ env.Qt5_DIR }}/plugins/platforms/qwindows.dll" upload/plugins/platforms + mkdir upload/plugins/sqldrivers + copy "${{ env.Qt5_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/plugins/sqldrivers + mkdir upload/plugins/styles + copy "${{ env.Qt5_DIR }}/plugins/styles/qwindowsvistastyle.dll" upload/plugins/styles + # cmake additionals mkdir upload/cmake copy build/compile_commands.json upload/cmake copy build/target_graph.dot upload/cmake