From 4708398d4048e5a72c1f83c4d26158744ea05676 Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Wed, 15 May 2024 20:45:20 -0500 Subject: [PATCH] ci: fixes --- .github/workflows/main_ci.yml | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 657710d5..9b96951d 100644 --- a/.github/workflows/main_ci.yml +++ b/.github/workflows/main_ci.yml @@ -22,25 +22,22 @@ jobs: compiler: - msvc steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 with: path: main + + - name: Setup cmake + uses: lukka/get-cmake@latest - - name: Setup vcpkg - run: | - mkdir -p ${{ env.VCPKG_DEFAULT_BINARY_CACHE }} - cd $env:VCPKG_INSTALLATION_ROOT - ./bootstrap-vcpkg.bat - ./vcpkg --version > ${{ github.workspace }}/vcpkg-version.txt + - name: Setup msvc + uses: ilammy/msvc-dev-cmd@v1.10.0 - - name: Cache vcpkg - uses: actions/cache@v2 - id: vcpkg-cache - env: - cache-name: vcpkg-cache + - name: Setup vcpkg + uses: friendlyanon/setup-vcpkg@v1 with: - path: ${{ env.VCPKG_DEFAULT_BINARY_CACHE }}/* - key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('main/**/vcpkg.json', 'vcpkg-version.txt') }} + committish: 943c5ef1c8f6b5e6ced092b242c8299caae2ff01 + path: "${{ github.workspace }}/.vcpkg" - name: Build uses: lukka/run-cmake@v10.0