Skip to content

Commit f8ff624

Browse files
ashishrp-awslaileni-aws
authored andcommitted
build(amazonq): merge release candidate version rc-20260122 (#8526)
This merges the released changes for rc-20260122 into main. MCM-XXX --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Co-authored-by: aws-toolkit-automation <>
1 parent 272b475 commit f8ff624

File tree

6 files changed

+12
-65
lines changed

6 files changed

+12
-65
lines changed

.github/workflows/node.js.yml

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
matrix:
127127
node-version: [18.x]
128128
vscode-version: [minimum, stable, insiders]
129-
package: [amazonq, toolkit]
129+
package: [amazonq]
130130
env:
131131
VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
132132
NODE_OPTIONS: '--max-old-space-size=8192'
@@ -181,67 +181,6 @@ jobs:
181181
with:
182182
run: npm run testWeb
183183

184-
cloudformation-integ:
185-
needs: lint-commits
186-
name: CloudFormation LSP E2E Tests
187-
runs-on: ${{ matrix.os }}
188-
strategy:
189-
fail-fast: false
190-
matrix:
191-
os: [ubuntu-latest, macos-latest, windows-latest]
192-
node-version: [18.x]
193-
vscode-version: [stable]
194-
env:
195-
VSCODE_TEST_VERSION: ${{ matrix.vscode-version }}
196-
NODE_OPTIONS: '--max-old-space-size=8192'
197-
steps:
198-
- uses: actions/checkout@v4
199-
- name: Use Node.js ${{ matrix.node-version }}
200-
uses: actions/setup-node@v4
201-
with:
202-
node-version: ${{ matrix.node-version }}
203-
- name: Setup CloudFormation LSP
204-
shell: bash
205-
run: bash packages/core/src/testE2E/cloudformation/setup-local-lsp.sh
206-
- run: npm ci
207-
- name: Run CloudFormation E2E Tests (Unix)
208-
if: runner.os != 'Windows'
209-
uses: coactions/setup-xvfb@v1
210-
with:
211-
run: npm run testE2ECfn -w packages/toolkit
212-
- name: Run CloudFormation E2E Tests (Windows)
213-
if: runner.os == 'Windows'
214-
run: npm run testE2ECfn -w packages/toolkit
215-
- name: Print Extension Logs
216-
if: failure()
217-
shell: bash
218-
run: |
219-
echo "=== AWS Toolkit Extension Logs ==="
220-
find packages/toolkit/.vscode-test/user-data/logs -name "*.log" -type f 2>/dev/null | while read logfile; do
221-
echo "--- $logfile ---"
222-
cat "$logfile" || echo "Could not read log file"
223-
done || echo "No extension logs found"
224-
225-
echo ""
226-
echo "=== CloudFormation LSP Server Logs ==="
227-
echo "LSP Path: $__CLOUDFORMATIONLSP_PATH"
228-
if [ -n "$__CLOUDFORMATIONLSP_PATH" ]; then
229-
LSP_LOG_DIR="$__CLOUDFORMATIONLSP_PATH/.aws-cfn-storage/logs"
230-
echo "Checking directory: $LSP_LOG_DIR"
231-
if [ -d "$LSP_LOG_DIR" ]; then
232-
find "$LSP_LOG_DIR" -name "*.log" -type f 2>/dev/null | while read logfile; do
233-
echo "--- $logfile ---"
234-
cat "$logfile" || echo "Could not read log file"
235-
done
236-
else
237-
echo "LSP logs directory does not exist: $LSP_LOG_DIR"
238-
echo "Contents of LSP path:"
239-
ls -la "$__CLOUDFORMATIONLSP_PATH" 2>/dev/null || echo "Cannot list LSP path"
240-
fi
241-
else
242-
echo "Environment variable __CLOUDFORMATIONLSP_PATH is not set"
243-
fi
244-
245184
windows:
246185
needs: lint-commits
247186
name: test Windows

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2026-01-23",
3+
"version": "1.108.0",
4+
"entries": []
5+
}

packages/amazonq/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.108.0 2026-01-23
2+
3+
- Miscellaneous non-user-facing changes
4+
15
## 1.107.0 2026-01-08
26

37
- Miscellaneous non-user-facing changes

packages/amazonq/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI–powered assistant for software development.",
5-
"version": "1.108.0-SNAPSHOT",
5+
"version": "1.109.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

packages/core/src/testLint/eslint.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ describe('eslint', function () {
3333
'.ts',
3434
'../amazonq',
3535
'../core',
36-
'../toolkit',
3736
// TODO: fix lint issues in scripts/
3837
// '../../scripts',
3938
],

0 commit comments

Comments
 (0)