Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

[pull] main from coder:main - #71

#71
Open
pull[bot] wants to merge 91 commits into
weiyilai:mainweiyilai/code-server:mainfrom
coder:maincoder/code-server:mainCopy head branch name to clipboard
Open

[pull] main from coder:main#71
pull[bot] wants to merge 91 commits into
weiyilai:mainweiyilai/code-server:mainfrom
coder:maincoder/code-server:mainCopy head branch name to clipboard

Conversation

@pull

@pull pull Bot commented May 8, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot locked and limited conversation to collaborators May 8, 2026
@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels May 8, 2026
code-asher added 2 commits May 8, 2026 09:58
Every hour seems aggressive, typically I will only check for PRs once a
day anyway.
You can now more easily run the update script to finish out an update
and the documentation is updated to match.
@code-asher
code-asher force-pushed the main branch 3 times, most recently from 70fb76d to c3f63c3 Compare May 8, 2026 21:15
@code-asher
code-asher force-pushed the main branch 3 times, most recently from 279bfc1 to ffbdec0 Compare May 20, 2026 22:08
Technically it is Code (or Code OSS), not VS Code.
The branches filter is the target, not the PR branch.
cdrci and others added 3 commits May 20, 2026 15:41
dependabot Bot and others added 30 commits June 16, 2026 11:52
The -dev seems a bit weird since it is not a dev version once it is
built, and also there is a false positive advisory with the code-oss-dev
name.
There is a new use of parsedArgs so we have to pass that in since we
parse on demand instead of globally.
Providing our own type is trivial.
It needs to parse the version *after* the VS Code update, otherwise it
is just pulling whatever the previous version was.

That means we cannot use it in the step title without some refactoring;
opted to just omit it for now.
The problem was that whenever the hashe needed an update, the current
patch would create a conflict which cannot be easily auto-resolved.

Instead, put the hashes in a separate patch that is deleted and
regenerated each time, avoiding the conflicts.

Also the web worker iframe hash was not being updated.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.