Skip to content

Commit 41860a1

Browse files
Merge branch 'aws:master' into master
2 parents c502ec0 + b488df4 commit 41860a1

File tree

78 files changed

+13157
-710
lines changed

Some content is hidden

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

78 files changed

+13157
-710
lines changed

.github/workflows/setup-release-candidate.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ jobs:
3131
run: |
3232
echo "BRANCH_NAME=release/rc-$(date +%Y%m%d)" >> $GITHUB_OUTPUT
3333
34+
- name: Install dependencies
35+
run: npm ci
36+
37+
- name: Generate license attribution
38+
run: npm run scan-licenses
39+
3440
- name: Create RC Branch
3541
env:
3642
BRANCH_NAME: ${{ steps.branch-name.outputs.BRANCH_NAME }}
@@ -41,5 +47,9 @@ jobs:
4147
# Create RC branch from specified commit
4248
git checkout -b $BRANCH_NAME
4349
50+
# Add generated license files
51+
git add LICENSE-THIRD-PARTY
52+
git commit -m "Update third-party license attribution for $BRANCH_NAME"
53+
4454
# Push RC branch
4555
git push origin $BRANCH_NAME

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,6 @@ packages/*/resources/css/icons.css
5757

5858
# Created by `npm run webRun` when testing extension in web mode
5959
.vscode-test-web
60+
61+
# License scanning output
62+
licenses-full.json

LICENSE-THIRD-PARTY

Lines changed: 10428 additions & 0 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,22 @@ We want your feedback!
5656
- [File an issue](https://github.com/aws/aws-toolkit-vscode/issues/new?labels=bug&template=bug_report.md)
5757
- Or [send a pull request](CONTRIBUTING.md)!
5858

59+
## License Scanning
60+
61+
To generate license reports and attribution documents for third-party dependencies:
62+
63+
```bash
64+
npm run scan-licenses
65+
66+
# Or run directly
67+
./scripts/scan-licenses.sh
68+
```
69+
70+
This generates:
71+
72+
- `LICENSE-THIRD-PARTY` - Attribution document for distribution
73+
- `licenses-full.json` - Complete license data
74+
5975
## License
6076

6177
This project and the subprojects within **(AWS Toolkit for Visual Studio Code, Amazon Q for Visual Studio Code)** is distributed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).

package-lock.json

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
"reset": "npm run clean && ts-node ./scripts/clean.ts node_modules && npm install",
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present",
4040
"mergeReports": "ts-node ./scripts/mergeReports.ts",
41-
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
41+
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/",
42+
"scan-licenses": "ts-node ./scripts/scan-licenses.ts"
4243
},
4344
"devDependencies": {
4445
"@aws-toolkits/telemetry": "^1.0.329",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"date": "2025-09-25",
3+
"version": "1.96.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q support web/container environments running Ubuntu/Linux, even when the host machine is Amazon Linux 2."
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-09-29",
3+
"version": "1.97.0",
4+
"entries": []
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-10-02",
3+
"version": "1.98.0",
4+
"entries": []
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-10-10",
3+
"version": "1.99.0",
4+
"entries": []
5+
}

0 commit comments

Comments
 (0)