Stop bundling libraries in release

- Instead we now use CentOS 7 for the static build to guarantee
  that we only depend on libc v2.17

- For macOS we now pull in a static node binary and bundle that instead.

Author: nhooyr

.github/workflows/ci.yaml

@@ -55,7 +55,7 @@ jobs:
           name: npm-package
           path: ./release-npm-package
       - name: Run ./ci/steps/release-packages.sh
-        uses: ./ci/container
+        uses: ./ci/container/centos
         with:
           args: ./ci/steps/release-packages.sh
       - name: Upload release artifacts
@@ -75,7 +75,7 @@ jobs:
           name: npm-package
           path: ./release-npm-package
       - name: Run ./ci/steps/release-packages.sh
-        uses: ./ci/container/arm64
+        uses: ./ci/container/centos
         with:
           args: ./ci/steps/release-packages.sh
       - name: Upload release artifacts
@@ -94,8 +94,6 @@ jobs:
         with:
           name: npm-package
           path: ./release-npm-package
-      - run: brew unlink node@12
-      - run: brew install node
       - run: ./ci/steps/release-packages.sh
         env:
           # Otherwise we get rate limited when fetching the ripgrep binary.

.gitignore

@@ -9,3 +9,4 @@ release-packages/
 release-gcp/
 release-images/
 node_modules
+node-*

ci/build/build-standalone-release.sh

@@ -17,14 +17,6 @@ main() {
   mkdir -p "$RELEASE_PATH/bin"
   rsync ./ci/build/code-server.sh "$RELEASE_PATH/bin/code-server"
   rsync "$node_path" "$RELEASE_PATH/lib/node"
-  if [[ $OS == "linux" ]]; then
-    bundle_dynamic_lib libstdc++
-    bundle_dynamic_lib libgcc_s
-  elif [[ $OS == "macos" ]]; then
-    bundle_dynamic_lib libicui18n
-    bundle_dynamic_lib libicuuc
-    bundle_dynamic_lib libicudata
-  fi
 
   ln -s "./bin/code-server" "$RELEASE_PATH/code-server"
   ln -s "./lib/node" "$RELEASE_PATH/node"
@@ -33,17 +25,4 @@ main() {
   yarn --production --frozen-lockfile
 }
 
-bundle_dynamic_lib() {
-  local lib_name="$1"
-  local lib_path
-
-  if [[ $OS == "linux" ]]; then
-    lib_path="$(ldd "$RELEASE_PATH/lib/node" | grep "$lib_name" | awk '{print $3 }')"
-  elif [[ $OS == "macos" ]]; then
-    lib_path="$(otool -L "$RELEASE_PATH/lib/node" | grep "$lib_name" | awk '{print $1 }')"
-  fi
-
-  cp "$lib_path" "$RELEASE_PATH/lib"
-}
-
 main "$@"

ci/build/code-server.sh

@@ -12,10 +12,10 @@ _realpath() {
 
   # See https://github.com/cdr/code-server/issues/1537
   if [ "$(uname)" = "Darwin" ]; then
-    # We read the symlink, which may be relative from $1.
     script="$1"
     if [ -L "$script" ]; then
       while [ -L "$script" ]; do
+        # We recursively read the symlink, which may be relative from $script.
         script="$(readlink "$script")"
         cd "$(dirname "$script")"
       done
@@ -32,9 +32,4 @@ _realpath() {
 }
 
 ROOT="$(dirname "$(dirname "$(_realpath "$0")")")"
-if [ "$(uname)" = "Linux" ]; then
-  export LD_LIBRARY_PATH="$ROOT/lib:${LD_LIBRARY_PATH-}"
-elif [ "$(uname)" = "Darwin" ]; then
-  export DYLD_LIBRARY_PATH="$ROOT/lib:${DYLD_LIBRARY_PATH-}"
-fi
 exec "$ROOT/lib/node" "$ROOT" "$@"

ci/build/test-standalone-release.sh

@@ -15,7 +15,8 @@ main() {
   ./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --install-extension ms-python.python
   local installed_extensions
   installed_extensions="$(./release-standalone/bin/code-server --extensions-dir "$EXTENSIONS_DIR" --list-extensions 2>&1)"
-  if [[ $installed_extensions != "ms-python.python" ]]; then
+  if [[ "$installed_extensions" != "info  Using config file ~/.config/code-server/config.yaml
+ms-python.python" ]]; then
     echo "Unexpected output from listing extensions:"
     echo "$installed_extensions"
     exit 1

ci/container/Dockerfile

@@ -43,7 +43,7 @@ RUN ARCH="$(dpkg --print-architecture)" && \
 #    rm -R shellcheck*
 
 # Install Go dependencies
-RUN ARCH="$(dpkg --print-architecture)" && \
+RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \
     curl -fsSL "https://dl.google.com/go/go1.14.3.linux-$ARCH.tar.gz" | tar -C /usr/local -xz
 ENV PATH=/usr/local/go/bin:/root/go/bin:$PATH
 ENV GO111MODULE=on

ci/container/arm64/Dockerfile

@@ -0,0 +1,22 @@
+FROM centos:7
+
+RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
+      yum install -y nodejs &&
+      npm install -g yarn
+
+RUN yum groupinstall -y 'Development Tools'
+RUN yum install -y python2 libsecret-devel libX11-devel libxkbfile-devel
+
+RUN npm config set python python2
+
+RUN yum install -y epel-release && yum install -y jq
+RUN yum install -y rsync
+
+# Copied from ../Dockerfile
+# Install Go dependencies
+RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \
+    curl -fsSL "https://dl.google.com/go/go1.14.3.linux-$ARCH.tar.gz" | tar -C /usr/local -xz
+ENV PATH=/usr/local/go/bin:/root/go/bin:$PATH
+ENV GO111MODULE=on
+RUN go get mvdan.cc/sh/v3/cmd/shfmt
+RUN go get github.com/goreleaser/nfpm/cmd/nfpm

ci/container/arm64/README.md

@@ -4,6 +4,11 @@ set -euo pipefail
 main() {
   cd "$(dirname "$0")/../.."
 
+  if [[ "$OSTYPE" == darwin* ]]; then
+    curl -L https://nodejs.org/dist/v14.4.0/node-v14.4.0-darwin-x64.tar.gz | tar -xz
+    PATH="$PATH:node-v14.4.0-darwin-x64/bin"
+  fi
+
   # https://github.com/actions/upload-artifact/issues/38
   tar -xzf release-npm-package/package.tar.gz