Add deb/rpm packages to CI

Author: nhooyr

.gitignore

@@ -2,7 +2,8 @@
 .cache
 dist*
 out*
-release
+release/
+release-static/
 release-github/
 release-gcp/
 node_modules

.travis.yml

@@ -10,8 +10,11 @@ jobs:
       #      if: tag IS present
       script:
         - travis_wait 60 ./ci/container/exec.sh ./ci/steps/static-release.sh
+        # 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
         - cd release && npm publish
-    #        - ./ci/release-container/push.sh
+        - ./ci/release-container/push.sh
+        - ./ci/steps/build-static-pkgs.sh
     - name: Linux ARM64 Release
       if: tag IS present
       script:

README.md

@@ -41,7 +41,7 @@ Use [sshcode](https://github.com/codercom/sshcode) for a simple setup.
 
 1. [Download a release](https://github.com/cdr/code-server/releases). (Linux and
    OS X supported. Windows support planned.)
-2. Unpack the downloaded release then run the included `code-server` script.
+2. Unpack the downloaded release then run the included `bin/code-server` script.
 3. In your browser navigate to `localhost:8080`.
 
 ## FAQ

ci/README.md

@@ -37,22 +37,38 @@ This directory contains the scripts used to build code-server.
   - 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.
-  - Will build a static release if `PACKAGE_NODE=1` is set.
 - [./build/code-server.sh](./build/code-server.sh)
   - Copied into static releases to run code-server with the bundled node binary.
-- [./build/archive-release.sh](./build/archive-release.sh)
-  - Archives `./release` into a tar/zip for CI with the proper directory name scheme
-- [./build/test-release.sh](./build/test-release.sh)
-  - Ensures code-server in the `./release` directory runs
+- [./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 the steps used in CI. It helps avoid
+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.

ci/build/archive-release.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Generates static code-server releases for CI.
+# This script assumes that a static release is built already.
+
+main() {
+  cd "$(dirname "${0}")/../.."
+  source ./ci/lib.sh
+
+  VERSION="$(pkg_json_version)"
+
+  local OS
+  OS="$(os)"
+
+  local ARCH
+  ARCH="$(arch)"
+
+  local archive_name="code-server-$VERSION-$OS-$ARCH"
+  mkdir -p release-github
+
+  local ext
+  if [[ $OS == "linux" ]]; then
+    ext=".tar.gz"
+    tar -czf "release-github/$archive_name$ext" --transform "s/^\.\/release-static/$archive_name/" ./release-static
+  else
+    mv ./release-static "./$archive_name"
+    ext=".zip"
+    zip -r "release-github/$archive_name$ext" "./$archive_name"
+    mv "./$archive_name" ./release-static
+  fi
+
+  echo "done (release-github/$archive_name)"
+
+  mkdir -p "release-gcp/$VERSION"
+  cp "release-github/$archive_name$ext" "./release-gcp/$VERSION/$OS-$ARCH$ext"
+  mkdir -p "release-gcp/latest"
+  cp "./release-github/$archive_name$ext" "./release-gcp/latest/$OS-$ARCH$ext"
+}
+
+main "$@"

ci/build/archive-static-release.sh

@@ -8,14 +8,18 @@ set -euo pipefail
 # Defaults to release
 RELEASE_PATH="${RELEASE_PATH-release}"
 
-# PACKAGE_NODE controls whether node and node_modules are packaged into the release.
+# STATIC controls whether node and node_modules are packaged into the release.
 # Disabled by default.
-PACKAGE_NODE="${PACKAGE_NODE-}"
+STATIC="${STATIC-}"
 
 # MINIFY controls whether minified vscode is bundled and whether
 # any included node_modules are pruned for production.
 MINIFY="${MINIFY-true}"
 
+VSCODE_SRC_PATH="lib/vscode"
+
+VSCODE_OUT_PATH="$RELEASE_PATH/lib/vscode"
+
 main() {
   cd "$(dirname "${0}")/../.."
   source ./ci/lib.sh
@@ -29,12 +33,11 @@ main() {
   rsync LICENSE.txt "$RELEASE_PATH"
   rsync ./lib/vscode/ThirdPartyNotices.txt "$RELEASE_PATH"
 
-  if [[ $PACKAGE_NODE ]]; then
-    rsync "$(command -v node)" "$RELEASE_PATH/node"
-    rsync ./ci/build/code-server.sh "$RELEASE_PATH/code-server"
-  else
-    rm -Rf "$RELEASE_PATH/node"
-    rm -Rf "$RELEASE_PATH/code-server"
+  if [[ $STATIC ]]; then
+    rsync "$RELEASE_PATH/" "$RELEASE_PATH-static"
+    RELEASE_PATH+=-static
+
+    bundle_node
   fi
 }
 
@@ -53,35 +56,20 @@ bundle_code_server() {
 
   rsync yarn.lock "$RELEASE_PATH"
 
-  if [[ $PACKAGE_NODE ]]; then
-    rsync node_modules "$RELEASE_PATH"
-  else
-    rm -Rf "$RELEASE_PATH/node_modules"
-  fi
-
-  if [[ $PACKAGE_NODE && $MINIFY ]]; then
-    pushd "$RELEASE_PATH"
-    yarn --production
-    popd
-  fi
-
   # Adds the commit to package.json
   jq --slurp '.[0] * .[1]' package.json <(
-    cat << EOF
+    cat <<EOF
   {
     "commit": "$(git rev-parse HEAD)",
     "scripts": {
       "install": "cd lib/vscode && yarn --production"
     }
   }
 EOF
-  ) > "$RELEASE_PATH/package.json"
+  ) >"$RELEASE_PATH/package.json"
 }
 
 bundle_vscode() {
-  local VSCODE_SRC_PATH="lib/vscode"
-  local VSCODE_OUT_PATH="$RELEASE_PATH/lib/vscode"
-
   mkdir -p "$VSCODE_OUT_PATH"
   rsync "$VSCODE_SRC_PATH/out-vscode${MINIFY+-min}/" "$VSCODE_OUT_PATH/out"
   rsync "$VSCODE_SRC_PATH/.build/extensions/" "$VSCODE_OUT_PATH/extensions"
@@ -91,29 +79,38 @@ bundle_vscode() {
 
   rsync "$VSCODE_SRC_PATH/yarn.lock" "$VSCODE_OUT_PATH"
 
-  if [[ $PACKAGE_NODE ]]; then
-    rsync "$VSCODE_SRC_PATH/node_modules" "$VSCODE_OUT_PATH"
-  else
-    rm -Rf "$VSCODE_OUT_PATH/node_modules"
-  fi
-
   # Adds the commit and date to product.json
   jq --slurp '.[0] * .[1]' "$VSCODE_SRC_PATH/product.json" <(
-    cat << EOF
+    cat <<EOF
   {
     "commit": "$(git rev-parse HEAD)",
     "date": $(jq -n 'now | todate')
   }
 EOF
-  ) > "$VSCODE_OUT_PATH/product.json"
+  ) >"$VSCODE_OUT_PATH/product.json"
 
   # We remove the scripts field so that later on we can run
   # yarn to fetch node_modules if necessary without build scripts
   # being ran.
-  jq 'del(.scripts)' < "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
+  jq 'del(.scripts)' <"$VSCODE_SRC_PATH/package.json" >"$VSCODE_OUT_PATH/package.json"
+}
 
-  if [[ $PACKAGE_NODE && $MINIFY ]]; then
-    pushd "$VSCODE_OUT_PATH"
+bundle_node() {
+  # We cannot find the path to node from $PATH because yarn shims a script to ensure
+  # we use the same version it's using so we instead run a script with yarn that
+  # will print the path to node.
+  local node_path
+  node_path="$(yarn -s node <<<'console.info(process.execPath)')"
+
+  mkdir -p "$RELEASE_PATH/bin"
+  rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
+  rsync "$node_path" "$RELEASE_PATH/lib/node"
+
+  rsync node_modules "$RELEASE_PATH"
+  rsync "$VSCODE_SRC_PATH/node_modules" "$VSCODE_OUT_PATH"
+
+  if [[ $MINIFY ]]; then
+    pushd "$RELEASE_PATH"
     yarn --production
     popd
   fi

ci/build/build-release.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Generates deb and rpm packages for CI.
+# Assumes a static release has already been built.
+
+main() {
+  cd "$(dirname "${0}")/../.."
+  source ./ci/lib.sh
+
+  VERSION="$(pkg_json_version)"
+  export VERSION
+
+  ARCH="$(arch)"
+  export ARCH
+
+  local nfpm_config
+  nfpm_config=$(envsubst <./ci/build/nfpm.yaml)
+
+  nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION.deb"
+  nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION.rpm"
+}
+
+main "$@"

ci/build/build-static-pkgs.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+exec /usr/lib/code-server/bin/code-server "$@"

ci/build/code-server-nfpm.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
 
-# This script is intended to be bundled into the self contained releases.
+# This script is intended to be bundled into the static releases.
 # Runs code-server with the bundled Node binary.
 
 # More complicated than readlink -f or realpath to support macOS.
 # See https://github.com/cdr/code-server/issues/1537
-get_installation_dir() {
+bin_dir() {
   # We read the symlink, which may be relative from $0.
   dst="$(readlink "$0")"
   # We cd into the $0 directory.
@@ -16,5 +16,5 @@ get_installation_dir() {
   pwd -P || exit 1
 }
 
-dir=$(get_installation_dir)
-exec "$dir/node" "$dir" "$@"
+BIN_DIR=$(bin_dir)
+exec "$BIN_DIR/../lib/node" "$BIN_DIR/.." "$@"

ci/build/code-server.sh

@@ -0,0 +1,16 @@
+name: "code-server"
+arch: "${ARCH}"
+platform: "linux"
+version: "v${VERSION}"
+section: "devel"
+priority: "optional"
+maintainer: "Anmol Sethi <hi@nhooyr.io>"
+description: |
+  Run VS Code in the web browser.
+vendor: "Coder"
+homepage: "https://github.com/cdr/code-server"
+license: "MIT"
+bindir: "/usr/bin"
+files:
+  ./ci/build/code-server-nfpm.sh: /usr/bin/code-server
+  ./release-static/**/*: "/usr/lib/code-server/"

ci/build/nfpm.yaml

@@ -8,7 +8,7 @@ main() {
   cd "$(dirname "${0}")/../.."
 
   local output
-  output=$(./release/code-server --list-extensions 2>&1)
+  output=$(./release-static/code-server --list-extensions 2>&1)
   if echo "$output" | grep 'was compiled against a different Node.js version'; then
     echo "$output"
     exit 1