]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
GHA/windows: drop vcpkg workaround
authorTal Regev <tal.regev@gmail.com>
Sat, 5 Oct 2024 02:22:05 +0000 (05:22 +0300)
committerViktor Szakats <commit@vsz.me>
Sat, 12 Oct 2024 20:47:31 +0000 (22:47 +0200)
Reverts 841f42150ae7b9f903cc5d266cec60a8090c0f27 #15133
Closes #15217

.github/workflows/windows.yml

index 864fe97405be66e8aa0f117620ab8de3ef790930..f62f1c25dea6a0ac47f617fdf9052096446afae2 100644 (file)
@@ -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