Skip to content

Commit 848ba96

Browse files
authored
Merge pull request #7478 from leigaol/master_into_f_inline
deps(amazonq): merge master into feature/flare-inline
2 parents 3e21737 + 038da1c commit 848ba96

Some content is hidden

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

64 files changed

+822
-640
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ If you need to report an issue attach these to give the most detailed informatio
382382
- ![](./docs/images/logsView.png)
383383
2. Click the gear icon on the bottom right and select `Debug`
384384
- ![](./docs/images/logsSetDebug.png)
385-
3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed
385+
3. Click the gear icon again and select `Set As Default`. This will ensure we stay in `Debug` until explicitly changed.
386386
- ![](./docs/images/logsSetDefault.png)
387387
4. Open the Command Palette again and select `Reload Window`.
388388
5. Now you should see additional `[debug]` prefixed logs in the output.

buildspec/release/50githubrelease.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,13 @@ phases:
3636
- echo "posting $VERSION with sha384 hash $HASH to GitHub"
3737
- PKG_DISPLAY_NAME=$(grep -m 1 displayName packages/${TARGET_EXTENSION}/package.json | grep -o '[a-zA-z][^\"]\+' | tail -n1)
3838
- RELEASE_MESSAGE="${PKG_DISPLAY_NAME} for VS Code $VERSION"
39+
# Only set amazonq as "latest" release. This ensures https://api.github.com/repos/aws/aws-toolkit-vscode/releases/latest
40+
# consistently points to the amazonq artifact, instead of being "random".
41+
- LATEST="$([ "$TARGET_EXTENSION" = amazonq ] && echo '--latest' || echo '--latest=false' )"
3942
- |
4043
if [ "$STAGE" = "prod" ]; then
4144
# note: the tag arg passed here should match what is in 10changeversion.yml
42-
gh release create --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
45+
gh release create "$LATEST" --repo $REPO --title "$PKG_DISPLAY_NAME $VERSION" --notes "$RELEASE_MESSAGE" -- "${TARGET_EXTENSION}/v${VERSION}" "$UPLOAD_TARGET" "$HASH_UPLOAD_TARGET"
4346
else
4447
echo "SKIPPED (stage=${STAGE}): 'gh release create --repo $REPO'"
4548
fi

package-lock.json

Lines changed: 22 additions & 185 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
4242
},
4343
"devDependencies": {
44-
"@aws-toolkits/telemetry": "^1.0.322",
44+
"@aws-toolkits/telemetry": "^1.0.323",
4545
"@playwright/browser-chromium": "^1.43.1",
4646
"@stylistic/eslint-plugin": "^2.11.0",
4747
"@types/he": "^1.2.3",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-05-22",
3+
"version": "1.69.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "/transform: avoid prompting user for target JDK path unnecessarily"
8+
},
9+
{
10+
"type": "Removal",
11+
"description": "/transform: remove option to select multiple diffs"
12+
}
13+
]
14+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"date": "2025-05-28",
3+
"version": "1.70.0",
4+
"entries": [
5+
{
6+
"type": "Removal",
7+
"description": "Disable local workspace LSP"
8+
}
9+
]
10+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-06-04",
3+
"version": "1.71.0",
4+
"entries": []
5+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"date": "2025-06-11",
3+
"version": "1.72.0",
4+
"entries": [
5+
{
6+
"type": "Feature",
7+
"description": "Launch LSP with bundled artifacts as fallback"
8+
}
9+
]
10+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Add MCP Server Support"
4+
}

0 commit comments

Comments
 (0)