diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4bb812e2..4f6ff291 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,6 +103,12 @@ jobs: if ([string]::IsNullOrWhiteSpace($vcpkgRoot)) { $vcpkgRoot = "${{ steps.vcpkg_retry.outputs.vcpkgRoot }}" } + if ([string]::IsNullOrWhiteSpace($vcpkgRoot) -and $env:RUNVCPKG_VCPKG_ROOT) { + $vcpkgRoot = $env:RUNVCPKG_VCPKG_ROOT + } + if ([string]::IsNullOrWhiteSpace($vcpkgRoot) -and $env:VCPKG_ROOT) { + $vcpkgRoot = $env:VCPKG_ROOT + } if ([string]::IsNullOrWhiteSpace($vcpkgRoot)) { Write-Host "::error::lukka/run-vcpkg did not emit vcpkgRoot" exit 1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 228f857a..4b374c36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -177,6 +177,12 @@ jobs: if ([string]::IsNullOrWhiteSpace($vcpkgRoot)) { $vcpkgRoot = "${{ steps.vcpkg_retry.outputs.vcpkgRoot }}" } + if ([string]::IsNullOrWhiteSpace($vcpkgRoot) -and $env:RUNVCPKG_VCPKG_ROOT) { + $vcpkgRoot = $env:RUNVCPKG_VCPKG_ROOT + } + if ([string]::IsNullOrWhiteSpace($vcpkgRoot) -and $env:VCPKG_ROOT) { + $vcpkgRoot = $env:VCPKG_ROOT + } if ([string]::IsNullOrWhiteSpace($vcpkgRoot)) { Write-Host "::error::lukka/run-vcpkg did not emit vcpkgRoot" exit 1