Skip to content

Commit 2c3ddba

Browse files
laileni-awslaileni-aws
authored
Merge branch 'feature/build-execute' into build-execute
2 parents 7e6a367 + 73f9ddf commit 2c3ddba

File tree

41 files changed

+591
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+591
-135
lines changed

‎.changes/3.56.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"date" : "2025-02-20",
3+
"version" : "3.56",
4+
"entries" : [ {
5+
"type" : "feature",
6+
"description" : "Amazon Q /doc: support making changes to architecture diagrams"
7+
} ]
8+
}

‎.changes/3.57.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"date" : "2025-02-28",
3+
"version" : "3.57",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "Fix suggestion not visible in remote for 2024.3"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "/test: update capability card text"
10+
}, {
11+
"type" : "bugfix",
12+
"description" : "Amazon Q /doc: update workspace too large error message"
13+
}, {
14+
"type" : "bugfix",
15+
"description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
16+
}, {
17+
"type" : "bugfix",
18+
"description" : "/transform: skip running tests locally when user chooses to do so"
19+
} ]
20+
}

‎.changes/next-release/feature-bfb6687a-a302-4968-8e7e-8fa0d4ef6c53.json‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
# _3.57_ (2025-02-28)
2+
- **(Bug Fix)** Fix suggestion not visible in remote for 2024.3
3+
- **(Bug Fix)** /test: update capability card text
4+
- **(Bug Fix)** Amazon Q /doc: update workspace too large error message
5+
- **(Bug Fix)** Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message
6+
- **(Bug Fix)** /transform: skip running tests locally when user chooses to do so
7+
8+
# _3.56_ (2025-02-20)
9+
- **(Feature)** Amazon Q /doc: support making changes to architecture diagrams
10+
111
# _3.55_ (2025-02-13)
212
- **(Feature)** /transform: support transformations to Java 21
313
- **(Bug Fix)** Enable syntax highlighting when viewing diff for /test

‎buildspec/linuxUiTests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ phases:
4747
- chmod +x gradlew
4848

4949
- ffmpeg -loglevel quiet -nostdin -f x11grab -video_size ${SCREEN_WIDTH}x${SCREEN_HEIGHT} -i ${DISPLAY} -codec:v libx264 -pix_fmt yuv420p -vf drawtext="fontsize=48:box=1:[email protected]:boxborderw=5:fontcolor=white:x=0:y=h-text_h:text='%{gmtime\:%H\\\\\:%M\\\\\:%S}'" -framerate 12 -g 12 /tmp/screen_recording.mp4 &
50-
- ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:test coverageReport --console plain --info
50+
- ./gradlew -PideProfileName=$ALTERNATIVE_IDE_PROFILE_NAME :ui-tests-starter:uiTest coverageReport --console plain --info
5151

5252
post_build:
5353
commands:

‎buildspec/windowsTests.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work throuh path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $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

‎buildspec/windowsTestsForAmazonQ.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work through path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $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

‎buildspec/windowsTestsForCore.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work through path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $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

‎buildspec/windowsTestsForToolkit.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work through path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $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

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
# Toolkit Version
5-
toolkitVersion=3.56-SNAPSHOT
5+
toolkitVersion=3.58-SNAPSHOT
66

77
# Publish Settings
88
publishToken=
99
publishChannel=
1010

11-
ideProfileName=2024.2
11+
ideProfileName=2024.3
1212

1313
remoteRobotPort=8080
1414

0 commit comments

Comments
 (0)