Kalan/cherrypick 6084 #6090
Closed
Kalan/cherrypick 6084 #6090
+80
−35
Conversation
This file contains 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
This PR backports the following commits from `main` branch to `vscode-v1.42.x`: - 45b9ff2 - bc8b14e These commits contain fixes for Deep Cody ## Test plan <!-- Required. See https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles. --> merged to main. ## Changelog <!-- OPTIONAL; info at https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c -->
## Test plan Unit tests added. Also before this fix problem was visible e.g. in duplicated shortcut tooltips next to the lens actions (due to property `cody.advanced.agent.running` being incorrectly overwritten). After this fix problem should disappear.
- Changed VS Code changelog links to `./vscode/changelod.md` to decouple our releases from marketing blog posts. We want all in-product messaging to point to our GitHub changelog, as we discussed with @kalanchan. - We plan to move the changelog to the root of the repo and implement changes necessary to maintain one changelog for multiple IDEs in a follow up.
This reverts commit 36d23c2.
…tically tagged (#6083) This makes several changes so we can do manually triggered insiders builds from a release branch instead of nightly on `main`. No changes to stable release builds in this PR. ## Test plan This does a dry run of the insiders build and verifies that the version tag is written to outputs: ``` $ CODY_RELEASE_DRY_RUN=true CODY_RELEASE_TYPE=insiders GITHUB_OUTPUT=/tmp/output.txt pnpm \ -C vscode run release $ cat /tmp/output.txt version_tag=vscode-insiders-v1.41.1730969154 ``` Testing the workflow itself we have to upload and trigger the workflow, here's a fork with a dry run: https://github.com/sourcegraph/cody/actions/runs/11719764387 ## Changelog - VSCode Insiders builds are now manually triggered, instead of nightly. - VSCode Insiders builds can be triggered on branches. We intend to produce these builds from release branches sometimes. - VSCode Insiders builds are tagged with `vscode-insiders-vN.N.NNNN`. This supports bisecting regressions in these builds.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry pick #6084 and #6083 into the 1.42.x release branch
Test plan
N/A
Changelog