coder · nhooyr · May 7, 2020 · Apr 30, 2020 · May 7, 2020
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,3 @@
 **
-!release
+!release-github
+!ci
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
-*.tsbuildinfo
+.tsbuildinfo
 .cache
-build
 dist*
 out*
 release/
-release-upload/
+release-static/
+release-github/
+release-gcp/
 node_modules
-binaries
diff --git a/.travis.yml b/.travis.yml
@@ -1,28 +1,37 @@
-language: minimal
+language: node_js
+node_js: node
 
 jobs:
   include:
     - name: Test
       if: tag IS blank
-      script: ./ci/image/run.sh "yarn && git submodule update --init && yarn vscode:patch && ./ci/ci.sh"
+      script: ./ci/container/exec.sh ./ci/steps/test.sh
       deploy: null
+      install: null
     - name: Linux Release
       if: tag IS present
-      script:
-        - travis_wait 60 ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh && ./ci/build-test.sh"
-        - ./ci/release-image/push.sh
-    - name: Linux ARM64 Release
-      if: tag IS present
-      script:
-        - ./ci/image/run.sh "yarn && yarn vscode && ci/release.sh && ./ci/build-test.sh"
-        - ./ci/release-image/push.sh
-      arch: arm64
+      script: ./ci/steps/linux-release.sh
+      install: null
+    # Unfortunately ARM on travis is very unreliable.
+    # We see random build failures, logging output being truncated, build being killed
+    # due to no output even though we use travis_wait etc.
+    # So we've disabled it for now.
+    #    - name: Linux Release
+    #      if: tag IS present
+    #      arch: arm64
+    #      script: |
+    #        sudo apt-get update && sudo apt-get install -y jq || exit 1
+    #        travis_wait 60 ./ci/steps/linux-release.sh
+    #      install: null
     - name: MacOS Release
       if: tag IS present
       os: osx
-      language: node_js
+      # node 13/14 crashes in the build process for some reason.
       node_js: 12
-      script: yarn && yarn vscode && travis_wait 60 ci/release.sh && ./ci/build-test.sh
+      script: |
+        HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install jq || exit 1
+        travis_wait 60 ./ci/steps/static-release.sh || exit 1
+      install: null
 
 before_deploy:
   - echo "$JSON_KEY" | base64 --decode > ./ci/key.json
@@ -36,23 +45,36 @@ deploy:
     target_commitish: $TRAVIS_COMMIT
     name: $TRAVIS_TAG
     file:
-      - release/*.tar.gz
-      - release/*.zip
+      - release-github/*.tar.gz
+      - release-github/*.zip
+      - release-github/*.deb
+      - release-github/*.rpm
     on:
       tags: true
   - provider: gcs
     edge: true
     bucket: "codesrv-ci.cdr.sh"
     upload_dir: "releases"
     key_file: ./ci/key.json
-    local_dir: release-upload
+    local_dir: ./release-gcp
     on:
       tags: true
       # TODO: The gcs provider fails to install on arm64.
-      condition: $TRAVIS_CPU_ARCH = amd64
+      condition: $TRAVIS_CPU_ARCH == amd64
+  - provider: script
+    edge: true
+    # We do not use the travis npm deploy integration as it does not allow us to
+    # deploy a subpath and and v2 which should, just errors out that the src does not exist
+    script: ./ci/steps/publish-npm.sh
+    on:
+      tags: true
+      condition: $TRAVIS_CPU_ARCH == amd64 && $TRAVIS_OS_NAME == linux
 
 cache:
   timeout: 600
   yarn: true
   directories:
+    - .cache
+    - out
+    - dist
     - lib/vscode/.build/extensions
diff --git a/ci/README.md b/ci/README.md
@@ -0,0 +1,82 @@
+# ci
+
+This directory contains scripts used for code-server's continuous integration infrastructure.
+
+Many of these scripts contain more detailed documentation and options in comments at the top.
+
+Any file and directory added into this tree should be documented here.
+
+## dev
+
+This directory contains scripts used for the development of code-server.
+
+- [./dev/container](./dev/container)
+  - See [CONTRIBUTING.md](../doc/CONTRIBUTING.md) for docs on the development container
+- [./dev/ci.sh](./dev/ci.sh) (`yarn ci`)
+  - Runs formatters, linters and tests
+- [./dev/fmt.sh](./dev/fmt.sh) (`yarn fmt`)
+  - Runs formatters
+- [./dev/lint.sh](./dev/lint.sh) (`yarn lint`)
+  - Runs linters
+- [./dev/test.sh](./dev/test.sh) (`yarn test`)
+  - Runs tests
+- [./dev/vscode.sh](./dev/vscode.sh) (`yarn vscode`)
+  - Ensures `lib/vscode` is cloned, patched and dependencies are installed
+- [./dev/vscode.patch](./dev/vscode.patch)
+  - Our patch of VS Code to enable remote browser access
+  - Generate it with `yarn vscode:diff` and apply with `yarn vscode:patch`
+- [./dev/watch.ts](./dev/watch.ts) (`yarn watch`)
+  - Starts a process to build and launch code-server and restart on any code changes
+  - Example usage in [CONTRIBUTING.md](../doc/CONTRIBUTING.md)
+
+## build
+
+This directory contains the scripts used to build code-server.
+
+- [./build/build-code-server.sh](./build/build-code-server.sh) (`yarn build`)
+  - Builds code-server into ./out and bundles the frontend into ./dist.
+- [./build/build-vscode.sh](./build/build-vscode.sh) (`yarn build:vscode`)
+  - Builds vscode into ./lib/vscode/out-vscode.
+- [./build/build-release.sh](./build/build-release.sh) (`yarn release`)
+  - Bundles the output of the above two scripts into a single node module at ./release.
+  - Will build a static release with node/node_modules into `./release-static`
+    if `STATIC=1` is set.
+- [./build/clean.sh](./build/clean.sh) (`yarn clean`)
+  - Removes all git ignored files like build artifacts.
+  - Will also `git reset --hard lib/vscode`
+  - Useful to do a clean build.
+- [./build/code-server.sh](./build/code-server.sh)
+  - Copied into static releases to run code-server with the bundled node binary.
+- [./build/archive-static-release.sh](./build/archive-static-release.sh)
+  - Archives `./release-static` into a tar/zip for CI with the proper directory name scheme
+- [./build/test-release.sh](./build/test-static-release.sh)
+  - Ensures code-server in the `./release-static` directory runs
+- [./build/build-static-pkgs.sh](./build/build-static-pkgs.sh) (`yarn pkg`)
+  - Uses [nfpm](https://github.com/goreleaser/nfpm) to generate .deb and .rpm from a static release
+- [./build/nfpm.yaml](./build/nfpm.yaml)
+  - Used to configure [nfpm](https://github.com/goreleaser/nfpm) to generate .deb and .rpm
+- [./build/code-server-nfpm.sh](./build/code-server-nfpm.sh)
+  - Entrypoint script for code-server for .deb and .rpm
+
+## release-container
+
+This directory contains the release docker container.
+
+## container
+
+This directory contains the container for CI.
+
+## steps
+
+This directory contains a few scripts used in CI. Just helps avoid clobbering .travis.yml.
+
+- [./steps/test.sh](./steps/test.sh)
+  - Runs `yarn ci` after ensuring VS Code is patched
+- [./steps/static-release.sh](./steps/static-release.sh)
+  - Runs the full static build process for CI
+- [./steps/linux-release.sh](./steps/linux-release.sh)
+  - Runs the full static build process for CI
+  - Packages the release into a .deb and .rpm
+  - Builds and pushes a docker release
+- [./steps/publish-npm.sh](./steps/publish-npm.sh)
+  - Authenticates yarn and publishes the built package from `./release`