TheLanc3/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2026-05-05 03:55:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Copy correct Node into release

Browse Source 
Still had the old code that copied the system Node, which in the case of
cross-compilation will be the wrong one.  Instead copy the one VS Code
downloads, which should be for the correct platform.
This commit is contained in:
Asher
2026-04-03 11:27:09 -08:00
parent b27ceeb106
commit 82fe3a72a2
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ci/build/build-release.sh
View File

@@ -36,13 +36,6 @@ main() {
rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH" rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
if [ "$KEEP_MODULES" = 1 ]; then if [ "$KEEP_MODULES" = 1 ]; then
# Copy Node. Package managers may shim their own "node" wrapper into the
# PATH, so run node and ask it for its true path.
local node_path
node_path="$(node -p process.execPath)"
rsync "$node_path" "$RELEASE_PATH/lib/node"
chmod 755 "$RELEASE_PATH/lib/node"
# Copy the code-server launcher. # Copy the code-server launcher.
mkdir -p "$RELEASE_PATH/bin" mkdir -p "$RELEASE_PATH/bin"
rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server" rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
@@ -108,8 +101,7 @@ bundle_vscode() {
# npm package so exclude any .gitignore files. # npm package so exclude any .gitignore files.
rsync_opts+=(--exclude .gitignore) rsync_opts+=(--exclude .gitignore)
# Exclude Node as we will add it ourselves for the standalone and will not # Exclude Node since we want to place it in a directory above.
# need it for the npm package.
rsync_opts+=(--exclude /node) rsync_opts+=(--exclude /node)
# Exclude Node modules. Note that these will already only include production # Exclude Node modules. Note that these will already only include production
@@ -121,6 +113,11 @@ bundle_vscode() {
rsync "${rsync_opts[@]}" "./lib/vscode-reh-web-$VSCODE_TARGET/" "$VSCODE_OUT_PATH" rsync "${rsync_opts[@]}" "./lib/vscode-reh-web-$VSCODE_TARGET/" "$VSCODE_OUT_PATH"
# Copy the Node binary.
if [[ $KEEP_MODULES = 1 ]]; then
cp "./lib/vscode-reh-web-$VSCODE_TARGET/node" "$RELEASE_PATH/lib"
fi
# Merge the package.json for the web/remote server so we can include # Merge the package.json for the web/remote server so we can include
# dependencies, since we want to ship this via NPM. # dependencies, since we want to ship this via NPM.
jq --slurp '.[0] * .[1]' \ jq --slurp '.[0] * .[1]' \