From de2e8a7ed80989334bd05f4fd2590c2654df9add Mon Sep 17 00:00:00 2001 From: Quinn Date: Fri, 6 Jun 2025 19:22:08 +0200 Subject: [PATCH] store vcpkg in cache to reduce runtime performance hit --- .github/workflows/ci.yaml | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a037121..f4e7b0b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,14 +14,25 @@ jobs: runs-on: ubuntu-latest container: ghcr.io/thepigeongenerator/mcaselector-lite:latest steps: - - run: git clone https://github.com/microsoft/vcpkg.git "${{env.VCPKG_ROOT}}" - - run: ${{env.VCPKG_ROOT}}/bootstrap-vcpkg.sh - - name: install vcpkg packages - run: ${{env.VCPKG_ROOT}}/vcpkg install glfw3:x64-linux-dynamic glfw3:x64-mingw-static; - - uses: actions/upload-artifact@v4 + - uses: actions/cache@v4 + id: vcpkg-cache with: - name: vcpkg path: ${{env.VCPKG_ROOT}} + key: vcpkg-${{runner.os}} + restore-keys: vcpkg-${{runner.os}} + - if: steps.vcpkg-cache.outputs.cache-hit != 'true' + run: | + git clone https://github.com/microsoft/vcpkg.git "$VCPKG_ROOT" + $VCPKG_ROOT/bootstrap-vcpkg.sh + - if: steps.vcpkg-cache.outputs.cache-hit == 'true' + run: | + cd "$VCPKG_ROOT" + git fetch + git checkout master + git reset --hard origin/master + ./bootstrap-vcpkg.sh + - name: install vcpkg packages + run: $VCPKG_ROOT/vcpkg install glfw3:x64-linux-dynamic glfw3:x64-mingw-static; compile: needs: setup-vcpkg runs-on: ubuntu-latest @@ -36,11 +47,11 @@ jobs: march: x86_64 cc: x86_64-w64-mingw32-gcc steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - uses: actions/cache@v4 with: - name: vcpkg path: ${{env.VCPKG_ROOT}} + key: vcpkg-${{runner.os}} + - uses: actions/checkout@v4 # compile - name: compile ${{matrix.march}}-${{matrix.kernel}} run: make compile MARCH=${{matrix.march}} KERNEL=${{matrix.kernel}} CC=${{matrix.cc}} -j @@ -60,14 +71,14 @@ jobs: cc: x86_64-linux-gnu-gcc # WARN: not testing win-x86_64... Probably a good idea to do that steps: + - uses: actions/cache@v4 + with: + path: ${{env.VCPKG_ROOT}} + key: vcpkg-${{runner.os}} - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 with: name: ${{matrix.march}}-${{matrix.kernel}}-rel path: obj/ - - uses: actions/download-artifact@v4 - with: - name: vcpkg - path: ${{env.VCPKG_ROOT}} - name: execute tests for ${{matrix.march}}-${{matrix.kernel}} run: make DEBUG=test run MARCH=${{matrix.march}} KERNEL=${{matrix.kernel}} CC=${{matrix.cc}} -j