diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 5b2039d1..4e9dde67 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -57,7 +57,6 @@ $ndkFolderDefault = Install $ndkCachedUrlDefault $ndkZip $ndkChecksumDefault $nd Set-EnvironmentVariable "ANDROID_NDK_ROOT_DEFAULT" $ndkFolderDefault # To be used by vcpkg Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderDefault -$env:ANDROID_NDK_HOME = "$ndkFolderDefault" if ($ndkVersionDefault -eq $ndkVersionLatest) { Write-Host "Android Latest version is the same than Default. NDK installation done." diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index ad01c499..9e4122ea 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -189,6 +189,8 @@ function Set-EnvironmentVariable Write-Host "Setting environment variable `"$($Key)`" to `"$($Value)`"" [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Machine) + # Make the envvar immediately available to subsequent scripts run in the same session. + [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Process) } function Is64BitWinHost diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index 1dc532c7..9b40afe0 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -75,11 +75,7 @@ Set-Content -Value "" -Path "$vcpkgRoot\vcpkg.disable-metrics" -Force Set-Location -Path "$vcpkgRoot" cmd.exe /c "$vcpkgRoot\bootstrap-vcpkg.bat" -# Setting VCPKG_ROOT using Set-EnvironmentVariable makes the variable only -# available during build time. In order to make it available during the -# provisioning, we need to directly set it via $env:VCPKG_ROOT as well. Set-EnvironmentVariable "VCPKG_ROOT" "$vcpkgRoot" -$env:VCPKG_ROOT = "$vcpkgRoot" # Set a source for vcpkg Binary and Asset Cache # The `coin/provisioning/common/windows/mount-vcpkg-cache-drive.ps1` script is