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

Kalan/cherrypick 6084 #6090

Closed
wants to merge 5 commits into from
Closed

Kalan/cherrypick 6084 #6090

wants to merge 5 commits into from

Commits on Nov 7, 2024

  1. [Backport] Cherry-pick fixes from main to vscode-v1.42.x (#6088)

    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
    -->
    abeatrix authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    931eaee View commit details
    Browse the repository at this point in the history
  2. Fix issue with merging configs (#6084)

    ## 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.
    pkukielka authored and kalanchan committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    dae06a0 View commit details
    Browse the repository at this point in the history
  3. VS Code: point releases to ./vscode/changelog.md (#6080)

    - 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.
    valerybugakov authored and kalanchan committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    36d23c2 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Configuration menu
    Copy the full SHA
    9355e0c View commit details
    Browse the repository at this point in the history
  2. chore/build: VSCode Insiders builds are manually triggered and automa…

    …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.
    dominiccooney authored and kalanchan committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    437c566 View commit details
    Browse the repository at this point in the history