diff --git a/.github/workflows/build-windows-solution.yml b/.github/workflows/build-windows-solution.yml index ae0d5253e12..f662fa91607 100644 --- a/.github/workflows/build-windows-solution.yml +++ b/.github/workflows/build-windows-solution.yml @@ -51,19 +51,16 @@ jobs: - name: Checkout repository uses: actions/checkout@main - - name: Restore artifacts and install vcpkg - id: vcpkg-step + - name: Install vcpkg run: | - $json=Get-Content vcpkg.json -Raw | ConvertFrom-Json - $vcpkgCommitId=$json.'builtin-baseline' + $vcpkgJson = Get-Content .\vcpkg.json -Raw | ConvertFrom-Json + $vcpkgCommitId = $vcpkgJson.'builtin-baseline'.Trim() Write-Host "vcpkg commit ID: $vcpkgCommitId" - echo "VCPKG_GIT_COMMIT_ID=$vcpkgCommitId" | Out-File -FilePath $env:GITHUB_ENV -Append - - - name: Get vcpkg commit id from vcpkg.json - uses: lukka/run-vcpkg@main - with: - vcpkgGitURL: "https://github.com/microsoft/vcpkg.git" - vcpkgGitCommitId: ${{ env.VCPKG_GIT_COMMIT_ID }} + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git checkout $vcpkgCommitId + .\bootstrap-vcpkg.bat + .\vcpkg integrate install - name: Print useful paths run: |