From: Tal Regev <tal.regev@gmail.com>
Date: Sat, 5 Oct 2024 02:22:05 +0000 (+0300)
Subject: GHA/windows: drop vcpkg workaround
X-Git-Tag: curl-8_11_0~162
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66cc0157567c4019db1e779572a401284a8e5a96;p=thirdparty%2Fcurl.git

GHA/windows: drop vcpkg workaround

Reverts 841f42150ae7b9f903cc5d266cec60a8090c0f27 #15133
Closes #15217
---

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