OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix vscode-ripgrep rebuild error

Browse Source
This commit is contained in:
Asher 2019-07-15 13:53:18 -05:00
parent feabfc86fa
commit 83819cb3f9
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/tasks.bash
View File

@ -98,9 +98,7 @@ function build-code-server() {
# latest glibc. This means you must build on the target system. # latest glibc. This means you must build on the target system.
log "Installing remote dependencies" log "Installing remote dependencies"
cd "${vscodeSourcePath}/remote" cd "${vscodeSourcePath}/remote"
# TODO: vscode-ripgrep errors saying node_modules doesn't exist. yarn --production --force --build-from-source
# TODO: yarn --force should be the same but it doesn't fix it.
npm rebuild || true
cp -r "${vscodeSourcePath}/remote/node_modules" "${codeServerBuildPath}" cp -r "${vscodeSourcePath}/remote/node_modules" "${codeServerBuildPath}"
# Only keep the production dependencies. # Only keep the production dependencies.
@ -131,14 +129,11 @@ function build-vscode() {
if [[ ! -d "${vscodeSourcePath}/node_modules" ]] ; then if [[ ! -d "${vscodeSourcePath}/node_modules" ]] ; then
exit-if-ci exit-if-ci
log "Installing VS Code dependencies" log "Installing VS Code dependencies"
# Not entirely sure why but there seem to be problems with native modules yarn
# so rebuild them.
# TODO: vscode-ripgrep errors saying node_modules doesn't exist.
# TODO: yarn --force should be the same but it'.
npm rebuild || true
# Keep just what we need to keep the pre-built archive smaller. # Keep just what we need to keep the pre-built archive smaller.
rm -rf "${vscodeSourcePath}/test" rm -rf "${vscodeSourcePath}/test"
rm -rf "${vscodeSourcePath}/remote/node_modules" # Will rebuild.
else else
log "${vscodeSourceName}/node_modules already exists, skipping install" log "${vscodeSourceName}/node_modules already exists, skipping install"
fi fi