Skip to content

Commit ffcd6a4

Browse files
authored
Merge branch 'main' into main
2 parents 9676fe6 + 64822d0 commit ffcd6a4

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

.github/workflows/publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147
run: echo "::set-output name=version::$(jq -r .version package.json)"
148148

149149
- name: Download release artifacts
150-
uses: robinraju/release-downloader@v1.4
150+
uses: robinraju/release-downloader@v1.5
151151
with:
152152
repository: "coder/code-server"
153153
tag: v${{ steps.version.outputs.version }}

ci/build/build-standalone-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ main() {
2828
ln -s "./lib/node" "$RELEASE_PATH/node"
2929

3030
pushd "$RELEASE_PATH"
31-
yarn --production --frozen-lockfile
31+
npm install --unsafe-perm --omit=dev
3232
popd
3333
}
3434

ci/build/npm-postinstall.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ install_with_yarn_or_npm() {
140140
echo "yarn.lock file present, running in development mode. use yarn to install code-server!"
141141
exit 1
142142
else
143-
npm install --omit=dev
143+
# HACK: NPM's use of semver doesn't like resolving some peerDependencies that vscode (upstream) brings in the form of pre-releases.
144+
# The legacy behavior doesn't complain about pre-releases being used, falling back to that for now.
145+
# See https://github.com//pull/5071
146+
npm install --unsafe-perm --legacy-peer-deps --omit=dev
144147
fi
145148
;;
146149
*)

docs/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ We recommend installing with `npm` when:
109109

110110
Installing code-server with `npm` builds native modules on install.
111111

112-
This process requires C dependencies; see our guide on [installing with npm][./npm.md](./npm.md) for more information.
112+
This process requires C dependencies; see our guide on [installing with npm](./npm.md) for more information.
113113

114114
## Standalone releases
115115

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-server",
33
"license": "MIT",
4-
"version": "4.6.1",
4+
"version": "4.6.1-1",
55
"description": "Run VS Code on a remote server.",
66
"homepage": "https://github.com/coder/code-server",
77
"bugs": {

test/unit/node/test-plugin/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "test-plugin",
44
"version": "1.0.0",
55
"engines": {
6-
"code-server": "^4.0.1"
6+
"code-server": "^4.6.1-1"
77
},
88
"main": "out/index.js",
99
"devDependencies": {

0 commit comments

Comments
 (0)