Skip to content

Commit bac8b42

Browse files
authored
Merge branch 'main' into main
2 parents cd99956 + 27a112c commit bac8b42

34 files changed

+220
-181
lines changed

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
echo "VERSION=${TAG#v}" >> $GITHUB_ENV
125125
126126
- name: Validate package
127-
uses: heyhusen/archlinux-package-action@v2.2.1
127+
uses: heyhusen/archlinux-package-action@v2.4.0
128128
env:
129129
VERSION: ${{ env.VERSION }}
130130
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ jobs:
268268
timeout-minutes: 15
269269
steps:
270270
- name: Download artifacts
271-
uses: dawidd6/action-download-artifact@v9
271+
uses: dawidd6/action-download-artifact@v10
272272
id: download
273273
with:
274274
branch: ${{ github.ref }}

.github/workflows/security.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
permissions:
4444
contents: read # for actions/checkout to fetch code
4545
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
46-
runs-on: ubuntu-20.04
46+
runs-on: ubuntu-22.04
4747
steps:
4848
- name: Checkout repo
4949
uses: actions/checkout@v4
@@ -72,7 +72,7 @@ jobs:
7272
contents: read # for actions/checkout to fetch code
7373
security-events: write # for github/codeql-action/autobuild to send a status report
7474
name: Analyze with CodeQL
75-
runs-on: ubuntu-20.04
75+
runs-on: ubuntu-22.04
7676

7777
steps:
7878
- name: Checkout repository

.github/workflows/trivy-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ concurrency:
4444

4545
jobs:
4646
trivy-scan-image:
47-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
4848

4949
steps:
5050
- name: Checkout code

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.19.0
1+
22.15.1

ci/build/npm-postinstall.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ main() {
7676
echo "USE AT YOUR OWN RISK!"
7777
fi
7878

79-
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-20}" ]; then
80-
echo "ERROR: code-server currently requires node v20."
79+
if [ "$major_node_version" -ne "${FORCE_NODE_VERSION:-22}" ]; then
80+
echo "ERROR: code-server currently requires node v22."
8181
if [ -n "$FORCE_NODE_VERSION" ]; then
8282
echo "However, you have overrided the version check to use v$FORCE_NODE_VERSION."
8383
fi

docs/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ The prerequisites for contributing to code-server are almost the same as those
3232
for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites).
3333
Here is what is needed:
3434

35-
- `node` v20.x
35+
- `node` v22.x
3636
- `git` v2.x or greater
3737
- [`git-lfs`](https://git-lfs.github.com)
3838
- [`npm`](https://www.npmjs.com/)

docs/android.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
1111
```
1212

1313
6. Exit the terminal using `exit` and then reopen the terminal
14-
7. Install and use Node.js 20:
14+
7. Install and use Node.js 22:
1515

1616
```shell
1717
nvm install 18

docs/npm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ includes installing instructions based on your operating system.
3030
## Node.js version
3131

3232
We use the same major version of Node.js shipped with Code's remote, which is
33-
currently `20.x`. VS Code also [lists Node.js
33+
currently `22.x`. VS Code also [lists Node.js
3434
requirements](https://github.com/microsoft/vscode/wiki/How-to-Contribute#prerequisites).
3535

3636
Using other versions of Node.js [may lead to unexpected
@@ -78,7 +78,7 @@ Proceed to [installing](#installing)
7878
## FreeBSD
7979

8080
```sh
81-
pkg install -y git python npm-node20 pkgconf
81+
pkg install -y git python npm-node22 pkgconf
8282
pkg install -y libinotify
8383
```
8484

docs/termux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ npm config set python python3
5757
node -v
5858
```
5959

60-
you will get Node version `v20`
60+
you will get Node version `v22`
6161

6262
5. Now install code-server following our guide on [installing with npm](./npm.md)
6363

0 commit comments

Comments
 (0)