Merge master into feature/ui-e2e-tests #7872
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
## Problem The AWS Toolkit VSCode project lacked a streamlined release candidate workflow. Creating release candidates would require manual branch creation and version management. ## Solution Added automated release candidate support: - Created `.github/workflows/setup-release-candidate.yml `- Workflow to create RC branches with automatic version bumping - Supports `Major/Minor/Patch/Custom` version increments - Reads and increments both `toolkit` and `amazonq` package versions independently - Creates date-based RC branches (`rc-YYYYMMDD`) - Commits version changes and pushes the RC branch - Updated `.github/workflows/release.yml` - Added support for `release/* ` branches - Automatically creates `rc-*` prefixed releases for release candidate branches - Proper release naming for RC artifacts This enables a clean RC workflow: trigger the setup workflow with a commit ID and version increment type, then the release pipeline automatically handles the rest. --- - 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.
## Problem The release candidate workflow was failing with "protected branch update failed" error because the default `GITHUB_TOKEN ` did not exist. ## Solution Updated the workflow to use `RELEASE_CANDIDATE_BRANCH_CREATION_PAT` instead of `GITHUB_TOKEN` in the checkout step. --- - 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.
…es away (#7868) ## Problem Amazon Q edit suggestions remain active even when users navigate far away from the suggestion location, leading to confusion and potential unintended edits when users accept suggestions they can no longer see. ## Solution Added automatic rejection of edit suggestions when the cursor moves more than 25 lines away from the suggestion location. Implemented cursor change listener with proper cleanup to prevent memory leaks and ensure suggestions are only accepted when contextually relevant. Fixed 2 failing recommendationService.test.ts tests --- - 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.
aws-toolkit-automation
merged commit 3135e98
into
feature/ui-e2e-tests
415 of 426 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):