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

Update Code to 1.97.0 #7199

Merged
merged 5 commits into from
Feb 12, 2025
Merged

Update Code to 1.97.0 #7199

merged 5 commits into from
Feb 12, 2025

Conversation

benz0li
Copy link
Contributor

@benz0li benz0li commented Feb 8, 2025

Fixes #7184

@benz0li benz0li requested a review from a team as a code owner February 8, 2025 06:18
@benz0li benz0li marked this pull request as draft February 8, 2025 06:29
@benz0li
Copy link
Contributor Author

benz0li commented Feb 8, 2025

Deployed at https://coder.jupyter.b-data.ch. Opening code-server returns 404s (Not Found).

@benz0li
Copy link
Contributor Author

benz0li commented Feb 9, 2025

If someone else wants to give it a try.

Dev Container

JupyerLab + code-server:

docker run -it --rm \
  -p 8888:8888 \
  -v jupyterlab-jovyan:/home/jovyan \
  glcr.b-data.ch/jupyterlab/python/base:latest-devtools

(Or use the Python base Data Science dev container with devtools installed)

The workflow from scratch

Apply/Update patches

  1. Clone repository

    mkdir projects/coder
    git clone https://github.com/coder/code-server.git projects/coder/code-server
  2. Update lib/vscode submodule to the new version

    cd projects/coder/code-server
    git submodule init
    git submodule update --remote
    cd lib/vscode
    git checkout 1.97.0
    cd ../..
  3. quilt push -f

    • If there are conflicts then resolve them
  4. quilt refresh

    • Back to step three until there are no more patches

Update Node version

  1. Check lib/vscode/remote/.npmrc

  2. Update

    • .node-version
    • package.json

    accordingly.

Set code-server version

export VERSION="4.97.0-rc.1"

Install dependencies

npm install

Build code-server

npm run build
npm run build:vscode
export KEEP_MODULES=1; npm run release

Modify code-server version

npm version --prefix release "$VERSION"
tmp=$(mktemp)
jq ".codeServerVersion = \"$VERSION\"" release/lib/vscode/product.json > "$tmp"
mv "$tmp" release/lib/vscode/product.json
chmod 644 release/lib/vscode/product.json

Build code-server release packages

npm run release:standalone
npm run test:integration
npm run package

Cross reference:

@benz0li
Copy link
Contributor Author

benz0li commented Feb 11, 2025

Ping @code-asher

@code-asher
Copy link
Member

Interesting, when I run it locally it all seems to work. I do see some base path stuff we could likely optimize so I will check that out. Not sure why CI is not running though, or why it thinks lib/vscode is conflicting with the main branch. 😕

benz0li and others added 2 commits February 11, 2025 12:47
This is to get a newer version of Node since we need > 20.18.1.
Copy link

codecov bot commented Feb 12, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.39%. Comparing base (99e1f63) to head (a17cb36).
Report is 19 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #7199      +/-   ##
==========================================
- Coverage   72.52%   72.39%   -0.13%     
==========================================
  Files          31       31              
  Lines        1907     1913       +6     
  Branches      412      414       +2     
==========================================
+ Hits         1383     1385       +2     
- Misses        444      446       +2     
- Partials       80       82       +2     

Continue to review full report in Codecov by Sentry.

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

@code-asher code-asher force-pushed the code-1.97.0 branch 5 times, most recently from c86cb8c to e62c15d Compare February 12, 2025 23:09
@code-asher code-asher marked this pull request as ready for review February 12, 2025 23:33
@code-asher code-asher merged commit d23d1a9 into coder:main Feb 12, 2025
9 of 10 checks passed
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.

Update Code to 1.97
2 participants