Skip to content

Commit af12f75

Browse files
rlirli
authored
Explicitly install .NET 6 in Windows buildspec (#4643)
1 parent c18d5ba commit af12f75

File tree

6 files changed

+20
-50
lines changed

6 files changed

+20
-50
lines changed

‎buildspec/windowsTests.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,15 @@ env:
77

88
phases:
99
install:
10-
runtime-versions:
11-
java: corretto17
12-
1310
commands:
1411
- |
1512
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1613
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
1714
Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
1815
}
19-
- dotnet --list-sdks
20-
- |
21-
$DOTNET_ROOT = "$Env:USERPROFILE\.dotnet"
22-
$Env:PATH = "$Env:PATH;$DOTNET_ROOT;$DOTNET_ROOT\tools"
23-
dotnet tool install -g AWS.CodeArtifact.NuGet.CredentialProvider
24-
dotnet codeartifact-creds install
16+
- if (Test-Path "C:\codebuild\global.json") { rm -fo "C:\codebuild\global.json" }
17+
- rm -r -fo "C:\Program Files\dotnet\sdk"
18+
- choco install -fy dotnet-6.0-sdk
2519
- dotnet --list-sdks
2620

2721
build:
@@ -32,7 +26,7 @@ phases:
3226
3327
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
3428
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
35-
$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
29+
# $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
3630
$Env:CODEARTIFACT_AUTH_TOKEN=aws codeartifact get-authorization-token --domain $Env:CODEARTIFACT_DOMAIN_NAME --query authorizationToken --output text --duration-seconds 3600
3731
}
3832

‎buildspec/windowsTestsForAmazonQ.yml‎

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

88
phases:
99
install:
10-
runtime-versions:
11-
java: corretto17
12-
1310
commands:
1411
- |
1512
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1613
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
1714
Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
1815
}
19-
- dotnet --list-sdks
20-
- |
21-
$DOTNET_ROOT = "$Env:USERPROFILE\.dotnet"
22-
$Env:PATH = "$Env:PATH;$DOTNET_ROOT;$DOTNET_ROOT\tools"
23-
dotnet tool install -g AWS.CodeArtifact.NuGet.CredentialProvider
24-
dotnet codeartifact-creds install
16+
- choco install -fy dotnet-8.0-sdk
17+
- choco install -fy dotnet-6.0-sdk
2518
- dotnet --list-sdks
2619

2720
build:
@@ -32,7 +25,7 @@ phases:
3225
3326
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
3427
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
35-
$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
28+
# $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
3629
$Env:CODEARTIFACT_AUTH_TOKEN=aws codeartifact get-authorization-token --domain $Env:CODEARTIFACT_DOMAIN_NAME --query authorizationToken --output text --duration-seconds 3600
3730
}
3831

‎buildspec/windowsTestsForCore.yml‎

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

88
phases:
99
install:
10-
runtime-versions:
11-
java: corretto17
12-
1310
commands:
1411
- |
1512
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1613
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
1714
Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
1815
}
19-
- dotnet --list-sdks
20-
- |
21-
$DOTNET_ROOT = "$Env:USERPROFILE\.dotnet"
22-
$Env:PATH = "$Env:PATH;$DOTNET_ROOT;$DOTNET_ROOT\tools"
23-
dotnet tool install -g AWS.CodeArtifact.NuGet.CredentialProvider
24-
dotnet codeartifact-creds install
16+
- choco install -fy dotnet-8.0-sdk
17+
- choco install -fy dotnet-6.0-sdk
2518
- dotnet --list-sdks
2619

2720
build:
@@ -32,7 +25,7 @@ phases:
3225
3326
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
3427
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
35-
$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
28+
# $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
3629
$Env:CODEARTIFACT_AUTH_TOKEN=aws codeartifact get-authorization-token --domain $Env:CODEARTIFACT_DOMAIN_NAME --query authorizationToken --output text --duration-seconds 3600
3730
}
3831

‎buildspec/windowsTestsForToolkit.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,15 @@ env:
77

88
phases:
99
install:
10-
runtime-versions:
11-
java: corretto17
12-
1310
commands:
1411
- |
1512
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1613
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
1714
Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
1815
}
19-
- dotnet --list-sdks
20-
- |
21-
$DOTNET_ROOT = "$Env:USERPROFILE\.dotnet"
22-
$Env:PATH = "$Env:PATH;$DOTNET_ROOT;$DOTNET_ROOT\tools"
23-
dotnet tool install -g AWS.CodeArtifact.NuGet.CredentialProvider
24-
dotnet codeartifact-creds install
16+
- rm -fo "C:\codebuild\global.json"
17+
- rm -r -fo "C:\Program Files\dotnet\sdk"
18+
- choco install -fy dotnet-6.0-sdk
2519
- dotnet --list-sdks
2620

2721
build:
@@ -32,7 +26,7 @@ phases:
3226
3327
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
3428
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
35-
$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
29+
# $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
3630
$Env:CODEARTIFACT_AUTH_TOKEN=aws codeartifact get-authorization-token --domain $Env:CODEARTIFACT_DOMAIN_NAME --query authorizationToken --output text --duration-seconds 3600
3731
}
3832

‎plugins/toolkit/jetbrains-rider/build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.jetbrains.rd.generator.gradle.RdGenTask
77
import io.gitlab.arturbosch.detekt.Detekt
88
import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
99
import org.jetbrains.intellij.tasks.PrepareSandboxTask
10+
import org.jetbrains.kotlin.com.intellij.openapi.util.SystemInfo
1011
import software.aws.toolkits.gradle.intellij.IdeFlavor
1112
import software.aws.toolkits.gradle.intellij.IdeVersions
1213
import java.nio.file.Path
@@ -309,6 +310,11 @@ tasks.withType<Detekt> {
309310
}
310311

311312
tasks.test {
313+
if (SystemInfo.isWindows) {
314+
// extremely flaky
315+
filter.excludeTestsMatching("software.aws.toolkits.jetbrains.services.lambda.dotnet.LambdaGutterMarkHighlightingTest*")
316+
}
317+
312318
useTestNG()
313319
environment("LOCAL_ENV_RUN", true)
314320
maxHeapSize = "1024m"

‎plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import base.backendStartTimeout
77
import com.jetbrains.rdclient.testFramework.waitForDaemon
88
import com.jetbrains.rider.projectView.solution
99
import com.jetbrains.rider.test.base.BaseTestWithMarkup
10-
import org.testng.SkipException
11-
import org.testng.annotations.BeforeMethod
1210
import org.testng.annotations.DataProvider
1311
import org.testng.annotations.Test
1412
import software.aws.toolkits.jetbrains.protocol.awsSettingModel
@@ -20,14 +18,6 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
2018
private const val LAMBDA_RUN_MARKER_ATTRIBUTE_ID = "AWS Lambda Run Method Gutter Mark"
2119
}
2220

23-
@BeforeMethod
24-
fun skipTestsOnWindows() {
25-
val ideVersion = System.getProperty("org.gradle.project.ideProfileName")
26-
if (System.getProperty("os.name").contains("Windows") && ideVersion == "2023.2") {
27-
throw SkipException("Test skipped because it flakes on Windows 2023.2")
28-
}
29-
}
30-
3121
override val backendLoadedTimeout: Duration = backendStartTimeout
3222
override val backendShellLoadTimeout: Duration = backendStartTimeout
3323

0 commit comments

Comments
 (0)