Skip to content

VS Code 1.60.0 via Submodule #4122

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

Closed
wants to merge 2 commits into from
Closed

VS Code 1.60.0 via Submodule #4122

wants to merge 2 commits into from

Conversation

GirlBossRush
Copy link
Contributor

@GirlBossRush GirlBossRush commented Sep 8, 2021

While #4010 resolves some incompatibilities with 1.60.0, it's still in review and needs additional testing. This PR updates lib/vscode to use a submodule pointing to our VS Code fork. Once this is merged, any remaining fork clean up branches will be ported over to the submodule.

Fixes #3917

Notable changes from upstream

  • The log service now defers initialization.
  • Several terminal channels were added.
  • Serval type definitions were adjusted.

How to review this PR

This is a somewhat unusual PR since we don’t yet have a diff to start with, however, I’ve made a branch on our fork with the previous changes form lib/vscode. This allows you compare all the changes from upstream, as well as the adjustments to our code to fix them in 1.60.0

coder/vscode@1.57.1-initial...cdr:1.60.0-code-server-patch

@GirlBossRush GirlBossRush added enhancement Some improvement that isn't a feature chore Related to maintenance or clean up labels Sep 8, 2021
@GirlBossRush GirlBossRush added this to the 3.12.0 milestone Sep 8, 2021
@GirlBossRush GirlBossRush self-assigned this Sep 8, 2021
@GirlBossRush GirlBossRush requested a review from a team as a code owner September 8, 2021 23:02
@github-actions
Copy link

github-actions bot commented Sep 8, 2021

✨ Coder.com for PR #4122 deployed! It will be updated on every commit.

@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 8, 2021

https://github.com/cdr/code-server/pull/4122/checks?check_run_id=3550356321#step:6:2125

It looks like the postinstall script is failing? Is that because it runs yarn inside lib/vscode but now that that's a submodule, we need to modify it? just a guess

@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 8, 2021

I'm looking at the list of commits and there are 3,600 😮 I'm thinking the only reasonable way to review this is to check it out locally, run it and make sure everything works

@GirlBossRush
Copy link
Contributor Author

@jsjoeio,

I'm looking at the list of commits and there are 3,600 😮 I'm thinking the only reasonable way to review this is to check it out locally, run it and make sure everything works

This is unfortunately the case until our own tests can run along side upstream’s to ensure we didn’t cause a regression in their code.

It looks like the postinstall script is failing? Is that because it runs yarn inside lib/vscode but now that that's a submodule, we need to modify it? just a guess

Bingo 😃

@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 8, 2021

Dang it! It failed again.

image

@GirlBossRush GirlBossRush force-pushed the vscode-1.60.0 branch 3 times, most recently from 1e05632 to b444675 Compare September 9, 2021 19:47
@codecov
Copy link

codecov bot commented Sep 9, 2021

Codecov Report

Merging #4122 (8ccf9a0) into main (b00afbc) will not change coverage.
The diff coverage is n/a.

❗ Current head 8ccf9a0 differs from pull request most recent head d7fd193. Consider uploading reports for the commit d7fd193 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##             main    #4122   +/-   ##
=======================================
  Coverage   64.12%   64.12%           
=======================================
  Files          36       36           
  Lines        1873     1873           
  Branches      379      379           
=======================================
  Hits         1201     1201           
  Misses        571      571           
  Partials      101      101           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b00afbc...d7fd193. Read the comment docs.

@jsjoeio jsjoeio self-assigned this Sep 9, 2021
- Remove asar linking.
- Remove module lint check.
- Use yarn for vscode vendoring.
@jsjoeio jsjoeio deleted the vscode-1.60.0 branch March 22, 2022 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Related to maintenance or clean up enhancement Some improvement that isn't a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade to VS Code 1.60
2 participants