Skip to content

chore: update vscode to 1.64 #4902

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

Merged
merged 11 commits into from
Mar 9, 2022
Merged

chore: update vscode to 1.64 #4902

merged 11 commits into from
Mar 9, 2022

Conversation

jsjoeio
Copy link
Contributor

@jsjoeio jsjoeio commented Feb 23, 2022

Blocked by coder/vscode#45

TODOs

Fixes #4822
Fixes #4725 (see #4725 (comment))

@jsjoeio jsjoeio self-assigned this Feb 23, 2022
@jsjoeio jsjoeio temporarily deployed to CI February 23, 2022 23:07 Inactive
@github-actions
Copy link

github-actions bot commented Feb 23, 2022

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

@jsjoeio jsjoeio temporarily deployed to CI March 2, 2022 21:32 Inactive
@jsjoeio jsjoeio force-pushed the jsjoeio-update-vscode-164 branch from e6077cd to e48506e Compare March 4, 2022 22:14
@jsjoeio jsjoeio temporarily deployed to CI March 4, 2022 22:14 Inactive
@jsjoeio jsjoeio marked this pull request as ready for review March 4, 2022 22:15
@jsjoeio jsjoeio requested a review from a team March 4, 2022 22:15
@codecov
Copy link

codecov bot commented Mar 4, 2022

Codecov Report

Merging #4902 (ed44bbc) into main (3b93a86) will increase coverage by 0.01%.
The diff coverage is 85.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4902      +/-   ##
==========================================
+ Coverage   70.54%   70.56%   +0.01%     
==========================================
  Files          29       29              
  Lines        1677     1678       +1     
  Branches      371      372       +1     
==========================================
+ Hits         1183     1184       +1     
  Misses        420      420              
  Partials       74       74              
Impacted Files Coverage Δ
src/node/main.ts 50.00% <0.00%> (ø)
src/node/constants.ts 100.00% <100.00%> (ø)
src/node/routes/vscode.ts 83.54% <100.00%> (ø)

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 3b93a86...ed44bbc. Read the comment docs.

@jsjoeio jsjoeio temporarily deployed to npm March 4, 2022 22:30 Inactive
@jsjoeio jsjoeio temporarily deployed to CI March 4, 2022 23:00 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 4, 2022 23:09 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 5, 2022 00:09 Inactive
@jsjoeio
Copy link
Contributor Author

jsjoeio commented Mar 7, 2022

Looks like the E2E tests are failing due to a missing dependency:

[2022-03-05T00:[19](https://github.com/coder/code-server/runs/5429719980?check_suite_focus=true#step:9:19):40.752Z] warn  Cannot find module '../../vendor/modules/code-oss-dev/package.json'
Require stack:
- /home/runner/work/code-server/code-server/src/node/constants.ts
- /home/runner/work/code-server/code-server/src/node/util.ts
- /home/runner/work/code-server/code-server/test/utils/globalE2eSetup.ts
- /home/runner/work/code-server/code-server/test/node_modules/@playwright/test/lib/loader.js
- /home/runner/work/code-server/code-server/test/node_modules/@playwright/test/lib/cli.js
- /home/runner/work/code-server/code-server/test/node_modules/playwright-core/lib/cli/cli.js
- /home/runner/work/code-server/code-server/test/node_modules/playwright-core/cli.js
- /home/runner/work/code-server/code-server/test/node_modules/playwright/cli.js

@jsjoeio jsjoeio force-pushed the jsjoeio-update-vscode-164 branch from 3980b85 to 8e628d5 Compare March 7, 2022 23:44
@jsjoeio jsjoeio temporarily deployed to CI March 7, 2022 23:44 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 8, 2022 00:00 Inactive
@jsjoeio
Copy link
Contributor Author

jsjoeio commented Mar 8, 2022

[2022-03-08T00:24:17.340Z] warn Cannot find module '/home/runner/work/code-server/code-server/vendor/modules/code-oss-dev/package.json'
Require stack:

Argh still failing. Might need your help looking at this again @code-asher

@jsjoeio jsjoeio temporarily deployed to CI March 8, 2022 17:24 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 8, 2022 17:32 Inactive
@jsjoeio
Copy link
Contributor Author

jsjoeio commented Mar 8, 2022

How to reproduce locally

We know that we can reproduce this issue Cannot find module '../../vendor/modules/code-oss-dev/package.json' locally by deleting the vendor/modules/code-oss-dev/package.json.

Root cause

We thought it was the package.json not getting included when using the vscode cache in CI so we added it here:

vendor/modules/code-oss-dev/package.json

So either that's not it or it didn't rebuild vscode even though we changed the cache key.

Looks like that didn't work. So we'll need to either temporarily disable cache or figure out something else.

image

EDIT: I confused the cache key with the job id. Newest commit should fix it. Trying this solution too

@jsjoeio jsjoeio temporarily deployed to CI March 8, 2022 20:09 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 8, 2022 20:25 Inactive
@jsjoeio jsjoeio temporarily deployed to CI March 8, 2022 21:45 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 8, 2022 21:54 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 8, 2022 22:07 Inactive
@jsjoeio jsjoeio temporarily deployed to CI March 8, 2022 23:48 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 8, 2022 23:57 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 9, 2022 20:48 Inactive
@jsjoeio jsjoeio temporarily deployed to CI March 9, 2022 20:59 Inactive
@jsjoeio jsjoeio temporarily deployed to npm March 9, 2022 21:08 Inactive
@jsjoeio jsjoeio merged commit 03e0bda into main Mar 9, 2022
@jsjoeio jsjoeio deleted the jsjoeio-update-vscode-164 branch March 9, 2022 21:28
TinLe pushed a commit to TinLe/code-server that referenced this pull request Apr 23, 2022
* chore: update vscode server files

* chore: update code to 1.64

* refactor: clean up code in constants.ts

* chore: keep package.json vscode cache

* fixup!: formatting

* feat(ci): add VSCODE_CACHE_VERSION

* fix(ci): add package.json for e2e tests

* fix: TS errors

* refactor: remove isConnected e2e tests
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.

[Chore]: update vscode to 1.64 titleBar color setting is ignored in version v4.0.1 (PWA mode)
2 participants