From 83599f1f7b0ae1b4dc0c3ef4f840fabb00682efb Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 25 Feb 2025 14:19:26 +0800 Subject: [PATCH 1/2] GHA CI: tweak cache size It seems ~500MB is enough to cache all the build artifacts but we still make it a bit larger to avoid thrashing. --- .github/workflows/ci_macos.yaml | 2 +- .github/workflows/ci_ubuntu.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml index 1113b634f..6dbbee82b 100644 --- a/.github/workflows/ci_macos.yaml +++ b/.github/workflows/ci_macos.yaml @@ -52,7 +52,7 @@ jobs: store_cache: ${{ github.ref == 'refs/heads/master' }} update_packager_index: false ccache_options: | - max_size=2G + max_size=1G - name: Install boost env: diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml index 2c15dd767..704ab0630 100644 --- a/.github/workflows/ci_ubuntu.yaml +++ b/.github/workflows/ci_ubuntu.yaml @@ -47,7 +47,7 @@ jobs: store_cache: ${{ github.ref == 'refs/heads/master' }} update_packager_index: false ccache_options: | - max_size=2G + max_size=1G - name: Install boost env: From 1b044d947611455979f8d4ab44c032223869d1a8 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 25 Feb 2025 14:23:29 +0800 Subject: [PATCH 2/2] GHA CI: shorten Windows CI build time Now vcpkg caches b2 tool. Boost doesn't need the exact b2 version to generate the cmake files. --- .github/workflows/ci_windows.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index 5be59987a..25ab24d8f 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -67,6 +67,7 @@ jobs: "set(VCPKG_BUILD_TYPE release)") # clear buildtrees after each package installation to reduce disk space requirements $packages = ` + "boost-build:x64-windows-static-md-release", "openssl:x64-windows-static-md-release", "zlib:x64-windows-static-md-release" ${{ env.vcpkg_path }}/vcpkg.exe upgrade ` @@ -95,8 +96,12 @@ jobs: } move "${{ github.workspace }}/../boost_*" "${{ env.boost_path }}" cd "${{ env.boost_path }}" - .\bootstrap.bat - .\b2.exe stage --stagedir=.\ --with-headers + #.\bootstrap.bat + ${{ env.vcpkg_path }}/installed/x64-windows-static-md-release/tools/boost-build/b2.exe ` + stage ` + toolset=msvc ` + --stagedir=.\ ` + --with-headers - name: Install Qt uses: jurplel/install-qt-action@v4