Merge branch 'master' into sr229/travis-arm

Author: Ayane Satomi

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 build
 release
+binaries
+source

.travis.yml

@@ -6,23 +6,23 @@ services:
 
 before_install:
   - export MAJOR_VERSION="2"
-  - export VSCODE_VERSION="1.38.1"
+  - export VSCODE_VERSION="1.39.2"
   - export VERSION="$MAJOR_VERSION.$TRAVIS_BUILD_NUMBER"
-  - export TAG="$VERSION-vsc$VSCODE_VERSION"
+  - export TAG="$VERSION-vsc$VSCODE_VERSION-$(uname -m)"
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export MINIFY="true"; fi
   - if [[ "$TRAVIS_BRANCH" == "master" ]]; then export PACKAGE="true"; fi
 
 # Don't build on tags because we'll already have built the commit.
 jobs:
   include:
-    - name: "Linux build - x86"
+    - name: "Linux build - x86_64"
       os: linux
       arch: amd64
       dist: trusty
       env: TARGET="linux"
       if: tag IS blank
       script: scripts/ci.bash
-    - name: "Alpine build - x86"
+    - name: "Alpine build - x86_64"
       os: linux
       arch: amd64
       dist: trusty
@@ -46,8 +46,8 @@ jobs:
     - name: "MacOS build"
       os: osx
       if: tag IS blank
-      script: travis_wait 30 scripts/ci.bash
-    - name: "Docker build - x86"
+      script: travis_wait 40 scripts/ci.bash
+    - name: "Docker build - x86_64"
       os: linux
       dist: trusty
       arch: amd64
@@ -99,6 +99,5 @@ deploy:
 
 cache:
   yarn: true
-  timeout: 1000
   directories:
-    - .cache
+    - source

Dockerfile

@@ -17,9 +17,9 @@ COPY . .
 RUN yarn \
 	&& MINIFY=true GITHUB_TOKEN="${githubToken}" yarn build "${vscodeVersion}" "${codeServerVersion}" \
 	&& yarn binary "${vscodeVersion}" "${codeServerVersion}" \
-	&& mv "/src/build/code-server${codeServerVersion}-vsc${vscodeVersion}-linux-x86_64-built/code-server${codeServerVersion}-vsc${vscodeVersion}-linux-x86_64" /src/build/code-server \
-	&& rm -r /src/build/vscode-* \
-	&& rm -r /src/build/code-server*-linux-*
+	&& mv "/src/binaries/code-server${codeServerVersion}-vsc${vscodeVersion}-linux-x86_64" /src/binaries/code-server \
+	&& rm -r /src/build \
+	&& rm -r /src/source
 
 # We deploy with ubuntu so that devs have a familiar environment.
 FROM ubuntu:18.04
@@ -54,7 +54,7 @@ WORKDIR /home/coder/project
 # mount. So that they do not lose their data if they delete the container.
 VOLUME [ "/home/coder/project" ]
 
-COPY --from=0 /src/build/code-server /usr/local/bin/code-server
+COPY --from=0 /src/binaries/code-server /usr/local/bin/code-server
 EXPOSE 8080
 
 ENTRYPOINT ["dumb-init", "code-server", "--host", "0.0.0.0"]

README.md

@@ -58,17 +58,13 @@ arguments when launching code-server with Docker. See
 
 ### Build
 
-- If you also plan on developing, set the `OUT` environment variable. Otherwise
-  it will build in this directory which will cause issues because `yarn watch`
-  will try to compile the build directory as well.
-- Run `yarn build ${vscodeVersion} ${codeServerVersion}` in this directory (for
-  example: `yarn build 1.36.0 development`).
-- If you target the same VS Code version our Travis builds do everything will
-  work but if you target some other version it might not (we have to do some
-  patching to VS Code so different versions aren't always compatible).
-- You can run the built code with `node path/to/build/out/vs/server/main.js` or run
-  `yarn binary` with the same arguments in the previous step to package the
-  code into a single binary.
+```shell
+export OUT=/path/to/output/build                  # Optional if only building. Required if also developing.
+yarn build ${vscodeVersion} ${codeServerVersion}  # See travis.yml for the VS Code version to use.
+                                                  # The code-server version can be anything you want.
+node ~/path/to/output/build/out/vs/server/main.js # You can run the built JavaScript with Node.
+yarn binary ${vscodeVersion} ${codeServerVersion} # Or you can package it into a binary.
+```
 
 ## Known Issues
 
@@ -109,11 +105,12 @@ data collected to improve code-server.
 ```shell
 git clone https://github.com/microsoft/vscode
 cd vscode
-git checkout <see travis.yml for the VS Code version to use here>
+git checkout ${vscodeVersion} # See travis.yml for the version to use.
+yarn
 git clone https://github.com/cdr/code-server src/vs/server
 cd src/vs/server
-yarn patch:apply
 yarn
+yarn patch:apply
 yarn watch
 # Wait for the initial compilation to complete (it will say "Finished compilation").
 # Run the next command in another shell.

package.json

@@ -1,33 +1,35 @@
 {
   "license": "MIT",
   "scripts": {
-    "ensure-in-vscode": "bash ./scripts/tasks.bash ensure-in-vscode",
-    "preinstall": "yarn ensure-in-vscode && cd ../../../ && yarn || true",
-    "postinstall": "rm -rf node_modules/@types/node",
-    "start": "yarn ensure-in-vscode && nodemon --watch ../../../out --verbose ../../../out/vs/server/main.js",
-    "watch": "yarn ensure-in-vscode && cd ../../../ && yarn watch",
-    "build": "bash ./scripts/tasks.bash build",
-    "package": "bash ./scripts/tasks.bash package",
-    "package-prebuilt": "bash ./scripts/tasks.bash package-prebuilt",
-    "binary": "bash ./scripts/tasks.bash binary",
-    "patch:generate": "yarn ensure-in-vscode && cd ../../../ && git diff --staged > ./src/vs/server/scripts/vscode.patch",
-    "patch:apply": "yarn ensure-in-vscode && cd ../../../ && git apply ./src/vs/server/scripts/vscode.patch"
+    "runner": "cd ./scripts && node --max-old-space-size=32384 -r ts-node/register ./build.ts",
+    "start": "nodemon --watch ../../../out --verbose ../../../out/vs/server/main.js",
+    "watch": "cd ../../../ && yarn watch",
+    "build": "yarn && yarn runner build",
+    "package": "yarn runner package",
+    "binary": "yarn runner binary",
+    "patch:generate": "cd ../../../ && git diff --staged > ./src/vs/server/scripts/vscode.patch",
+    "patch:apply": "cd ../../../ && git apply ./src/vs/server/scripts/vscode.patch"
   },
   "devDependencies": {
     "@coder/nbin": "^1.2.2",
+    "@types/fs-extra": "^8.0.1",
+    "@types/node": "^10.12.12",
     "@types/pem": "^1.9.5",
     "@types/safe-compare": "^1.1.0",
     "@types/tar-fs": "^1.16.1",
     "@types/tar-stream": "^1.6.1",
-    "nodemon": "^1.19.1"
+    "fs-extra": "^8.1.0",
+    "nodemon": "^1.19.1",
+    "ts-node": "^8.4.1",
+    "typescript": "3.6"
   },
   "resolutions": {
     "@types/node": "^10.12.12",
     "safe-buffer": "^5.1.1"
   },
   "dependencies": {
     "@coder/logger": "^1.1.8",
-    "@coder/node-browser": "^1.0.5",
+    "@coder/node-browser": "^1.0.6",
     "@coder/requirefs": "^1.0.6",
     "httpolyglot": "^0.1.2",
     "pem": "^1.14.2",