Merge 76a2116 into 7925f88

Author: Teffen Ellis

ci/dev/postinstall.sh

@@ -4,14 +4,14 @@ set -euo pipefail
 main() {
   cd "$(dirname "$0")/../.."
 
-  echo 'Installing code-server test dependencies...'
+  echo "Installing code-server test dependencies..."
 
   cd test
   yarn install
   cd ..
 
   cd vendor
-  echo 'Installing vendor dependencies...'
+  echo "Installing vendor dependencies..."
 
   # * We install in 'modules' instead of 'node_modules' because VS Code's extensions
   # use a webpack config which cannot differentiate between its own node_modules
@@ -21,7 +21,14 @@ main() {
   # devDependencies are not needed, and that even git repo based packages are
   # assumed to be compiled. Because the default behavior for VS Code's `postinstall`
   # assumes we're also compiled, this needs to be ignored.
-  yarn install --modules-folder modules --ignore-scripts --frozen-lockfile
+
+  local args=(install --modules-folder modules --ignore-scripts)
+
+  if [[ ${CI-} ]]; then
+    args+=("--frozen-lockfile")
+  fi
+
+  yarn "${args[@]}"
 
   # Finally, run the vendor `postinstall`
   yarn run postinstall

docs/MAINTAINING.md

@@ -20,6 +20,7 @@
 Current maintainers:
 
 - @code-asher
+- @TeffenEllis
 - @oxy
 - @jsjoeio
 

vendor/package.json

@@ -7,6 +7,6 @@
     "postinstall": "./postinstall.sh"
   },
   "devDependencies": {
-    "code-oss-dev": "cdr/vscode#96a09a7846538c3bbedb6a2aeca729537bb8202b"
+    "code-oss-dev": "cdr/vscode#9cb5fb3759f46b10bc66e676fa7f44c51e84824b"
   }
 }