diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 5bc29f9a7a2e72..0bd75586aed713 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -37,7 +37,7 @@ jobs: run: | git config user.email github-actions git config user.name github-actions@github.com - + unset VCPKG_ROOT git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license ./vcpkg format-manifest --all --convert-control diff --git a/build-vcpkg.ps1 b/build-vcpkg.ps1 index f23c1ba438cfd6..180f7421eead61 100644 --- a/build-vcpkg.ps1 +++ b/build-vcpkg.ps1 @@ -1,7 +1,7 @@ $ErrorActionPreference = "Stop" function Invoke-VcpkgBuild($pkg) { - .\vcpkg.exe install $pkg`:x64-windows-mixed + .\vcpkg.exe install $pkg`:x64-windows-mixed --vcpkg-root . if ($LastExitCode -ne 0) { throw } } @@ -35,5 +35,5 @@ Invoke-VcpkgBuild "gtest" # export created libraries and set version .\vcpkg.exe export --x-all-installed --raw -Move-Item -Path .\vcpkg-export-* -Destination .\vcpkg +Move-Item -Path .\vcpkg-export-* -Destination .\vcpkg --vcpkg-root . Write-Output 16 > vcpkg\installed\version.txt