Skip to content

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

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):

git stash
git fetch --all
git checkout origin/feature/amazonqLSP
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/amazonqLSP

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner January 27, 2025 14:50
@github-actions
Copy link

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

Hweinstock and others added 6 commits January 27, 2025 12:58
## Problem
Currently seeing the following error on master 
```
passes eslint:

      AssertionError [ERR_ASSERTION]: ,
/home/runner/work/aws-toolkit-vscode/aws-toolkit-vscode/packages/core/src/shared/clients/s3Client.ts
Error:   468:[31](https://github.com/aws/aws-toolkit-vscode/actions/runs/12991583651/job/36229470175#step:6:32)  error  Delete `·`  prettier/prettier`
```

## Solution
- delete the extra space. 


---

- 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 "jscpd" CI check is often unnoticed by contributors, possibly
because its purpose is not clear.

## Solution
Rename it.
## Problem
Our release MCM currently has a step for each extension (Toolkit and Q)
that requires the human operator to wait and check for the marketplace
publish and then try to install from the marketplace. This uses human
time and can easily be automated.

## Solution
Added a final stage in release pipeline:
https://code.amazon.com/reviews/CR-173945904/revisions/1#/commits

that runs this YML build script that automatically installs and
uninstalls the extension from marketplace on a two minute interval.

When the version matches the new release version, the code-build
succeeds:
<img width="768" alt="Screenshot 2025-01-23 at 2 44 45 PM"
src="https://github.com/user-attachments/assets/93f80a6d-573c-4524-995c-6491ecf1fb6f"
/>


When it doesn't, it keeps retrying until the timeout limit is reached (1
hour):
<img width="694" alt="Screenshot 2025-01-23 at 4 52 07 PM"
src="https://github.com/user-attachments/assets/c5433383-1194-4ec4-845a-4e63d8959cf7"
/>

---

- 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: tomzu <[email protected]>
…ment group #6217

## Problem
Most users might have disabled workspace context due to previous
sub-process performance issue, therefore #6098 experiment has too few
datapoints.

## Solution
As we've been actively working on fixes to improve the amazon q helper
sub-process performance, the team decided to try turn on (only once)
workspace context for a small fraction of all users (20%) to collect few
more datapoints.
…ed (#6409)

## Problem
- Installed LSP artifacts remain forever. There is no cleanup effort
made.

## Solution
Implement the following heuristic:
- Delete all currently installed delisted versions. 
- Delete all versions that remain, except the most recent 2. 

Included in this change is a new utility function `partition`.
`partition` is like `filter`, but it produces both the positive and
negative result in two separate sublists. See the tests for a simple
example.

---

- 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.
@jpinkney-aws jpinkney-aws requested a review from a team as a code owner January 28, 2025 13:55
@jpinkney-aws jpinkney-aws merged commit b17b3fa into feature/amazonqLSP Jan 28, 2025
33 of 35 checks passed
@jpinkney-aws jpinkney-aws deleted the autoMerge/feature/amazonqLSP branch January 28, 2025 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants