From 66cc0157567c4019db1e779572a401284a8e5a96 Mon Sep 17 00:00:00 2001 From: Tal Regev Date: Sat, 5 Oct 2024 05:22:05 +0300 Subject: [PATCH] GHA/windows: drop vcpkg workaround Reverts 841f42150ae7b9f903cc5d266cec60a8090c0f27 #15133 Closes #15217 --- .github/workflows/windows.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 864fe97405..f62f1c25de 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -732,12 +732,7 @@ jobs: - name: 'vcpkg build' timeout-minutes: 35 - run: | - # Temporary workaround pending: https://github.com/microsoft/vcpkg-tool/pull/1501 - export SystemDrive="$SYSTEMDRIVE" - export SystemRoot="$SYSTEMROOT" - export windir="$WINDIR" - vcpkg x-set-installed ${{ matrix.install }} '--triplet=${{ matrix.arch }}-${{ matrix.plat }}' + run: vcpkg x-set-installed ${{ matrix.install }} '--triplet=${{ matrix.arch }}-${{ matrix.plat }}' - name: 'cmake configure' timeout-minutes: 5