From bfa65a179caed79f13eff224ae9bb5fe05174989 Mon Sep 17 00:00:00 2001 From: Shane-J-Latham Date: Sun, 7 Jan 2024 10:19:13 +1100 Subject: [PATCH] Revert, give up on runner.os conditional in .github/workflows/python-wheel-vcpkg.yml. --- .github/workflows/python-wheel-vcpkg.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/python-wheel-vcpkg.yml b/.github/workflows/python-wheel-vcpkg.yml index 24cfdf0..869f6e8 100644 --- a/.github/workflows/python-wheel-vcpkg.yml +++ b/.github/workflows/python-wheel-vcpkg.yml @@ -42,13 +42,11 @@ jobs: fi - name: Install cmake and ninja (via get-cmake) - shell: bash - if: ${{ runner.os != 'Linux' }} uses: lukka/get-cmake@latest + shell: bash - name: Restore artifacts, or setup vcpkg for building artifacts shell: bash - if: ${{ runner.os != 'Linux' }} uses: lukka/run-vcpkg@v11 with: # This specifies the location of vcpkg, where it is going to be restored from cache, or create from scratch. @@ -61,7 +59,6 @@ jobs: - name: Prints output of run-vcpkg's action. shell: bash - if: ${{ runner.os != 'Linux' }} run: | echo "VCPKG_ROOT=${VCPKG_ROOT}" echo "root='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_ROOT_OUT }}', triplet='${{ steps.runvcpkg.outputs.RUNVCPKG_VCPKG_DEFAULT_TRIPLET_OUT }}' "