Skip to content

Commit 89eabdc

Browse files
authored
Fix Windows unit test environment (#4104)
1 parent 2f2505e commit 89eabdc

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

buildspec/windowsTests.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,10 @@ env:
77

88
phases:
99
install:
10+
runtime-versions:
11+
java: corretto17
12+
1013
commands:
11-
- |
12-
$url = 'https://corretto.aws/downloads/latest/amazon-corretto-17-x64-windows-jdk.msi';
13-
Write-Host ('Downloading from {0}' -f $url);
14-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
15-
Invoke-WebRequest -Uri $url -OutFile 'corretto_jdk_build.msi';
16-
Start-Process 'corretto_jdk_build.msi' -PassThru | Wait-Process
17-
- |
18-
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
19-
ls $_ | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
20-
}
21-
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
2214
- |
2315
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
2416
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -41,7 +33,6 @@ phases:
4133
# See https://github.com/NuGet/NuGet.Client/pull/4259
4234
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
4335
44-
$Env:JAVA_HOME = $JAVA_HOME
4536
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
4637
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
4738
$Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

0 commit comments

Comments
 (0)