Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.10.2 patch release #3600

Merged
merged 11 commits into from
Apr 2, 2024
Merged

1.10.2 patch release #3600

merged 11 commits into from
Apr 2, 2024

Conversation

slimsag
Copy link
Member

@slimsag slimsag commented Mar 28, 2024

Context

I need to create a patch release for #3218 needed by a customer. Unfortunately I narrowly missed v1.10.1, so need to create v1.10.2.

The commit that is tagged as vscode-v1.10.1, 30c220d, does not exist in this repository as GitHub's web UI will warn you - so it is not possible for me to actually get a copy of this commit to base my v1.10.2 branch off of. GitHub won't serve it to me:

  • It seems like this is because we deleted the branch that commit was a part of, though probably @valerybugakov still has a copy of that commit locally he could push up to a branch.
  • I will propose some changes to how we create patch releases in @abeatrix's PR Doc: patch release instructions #3598 to prevent this from happening in the future.

How I produced this branch

To create this branch, I started with vscode-v1.10.0 and looked at what commits were new in https://github.com/sourcegraph/cody/commits/vscode-v1.10.1/ and (cherry-picked or re-created manually via curl'ing the diffs) the exact history:

image

Specifically:

  1. Started with vscode-v1.10.0
  2. cherry-pick'd ab33a66 from main
  3. cherry-pick'd 81db913 from main
  4. cherry-pick'd ae39088 from main
  5. cherry-pick'd ee41055 from main
  6. re-created 85a5f2b
  7. re-created 30c220d

Then I added my changes on top:

Test plan

CI passes

valerybugakov and others added 8 commits March 28, 2024 10:24
Re-created 85a5f2b
as it is unfetchable (not in a repository branch anywhere so GitHub will not serve it.)

Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
Re-created 30c220d
as it is unfetchable (not in a repository branch anywhere so GitHub will not serve it.)

(re-created by `curl`'ing the files from github directly.)

Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
…#3218)

Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
@slimsag slimsag requested a review from abeatrix March 28, 2024 18:54
@slimsag slimsag changed the base branch from main to vscode/1.10 March 28, 2024 18:54
@slimsag
Copy link
Member Author

slimsag commented Mar 28, 2024

Highlighting this part:

created 9e452a4 by following these steps and accepting all changes (this one concerns me, why are there so many changes generated by pnpm update-agent-recordings u here?)

@abeatrix not sure if you have any thoughts on this? this was the best I could sort out, was kinda tricky

Copy link
Member

@valerybugakov valerybugakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch includes all the commits from the v1.10.1 release. LGTM!
Left one comment about the changelog updates we need to address before cutting this release.

Comment on lines 9 to 17
- Cody Enterprise users now have access to an `experimental-openaicompatible` which allows bringing your own LLM via any OpenAI-compatible API. For now, this is only supported with Starchat and specific configurations - but we continue to generalize this work to support more models and OpenAI-compatible endpoints. [pull/3218](https://github.com/sourcegraph/cody/pull/3218)
- Edit/Chat: Cody now expands the selection to the nearest enclosing function, if available, before attempting to expand to the nearest enclosing block. [pull/3507](https://github.com/sourcegraph/cody/pull/3507)
- Edit: New `cody.edit.preInstruction` configuration option for adding custom instruction at the end of all your requests. [pull/3542](https://github.com/sourcegraph/cody/pull/3542)
- Edit: Add support for the new `cody.edit.preInstruction` setting. [pull/3542](https://github.com/sourcegraph/cody/pull/3542)
- Edit: Added telemetry to measure the persistence of edits in the document. [pull/3550](https://github.com/sourcegraph/cody/pull/3550)
- Edit: "Ask Cody to Fix" now uses Claude 3 Sonnet. [pull/3555](https://github.com/sourcegraph/cody/pull/3555)
- Chat: Added buttons in the chat input box for enabling/disabling Enhanced Context. [pull/3547](https://github.com/sourcegraph/cody/pull/3547)
- Edit: Display warnings for large @-mentioned files during selection. [pull/3494](https://github.com/sourcegraph/cody/pull/3494)
- Edit: Automatically show open tabs as available options when triggering an @-mention. [pull/3494](https://github.com/sourcegraph/cody/pull/3494)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to drop these before pushing the release tag. The Unreleased section should be empty.

Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
Signed-off-by: Stephen Gutekanst <stephen@sourcegraph.com>
@slimsag slimsag merged commit 4a51457 into vscode/1.10 Apr 2, 2024
19 checks passed
@slimsag slimsag deleted the sg/1.10.2-patch-release branch April 2, 2024 00:12
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.

None yet

3 participants