fixup! fixup! fixup! fixup! Add NPM package, debs, rpms and refactor CI/build process

nhooyr · nhooyr · commit d3646b373d56 · 2020-05-06T19:04:17.000-04:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,7 @@ jobs:
       deploy: null
       install: null
     - name: Linux Release #if: tag IS present
-      script: |
-        ./ci/steps/linux-release.sh || exit 1
-        ./ci/steps/publish-npm.sh || exit 1
+      script: ./ci/steps/linux-release.sh
       install: null
     - name: Linux Release #if: tag IS present
       arch: arm64
@@ -21,9 +19,11 @@ jobs:
       install: null
     - name: MacOS Release #if: tag IS present
       os: osx
+      # node 13/14 crashes in the build process for some reason.
+      node_js: 12
       script: |
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install jq || exit 1
-        travis_wait 30 ./ci/steps/static-release.sh || exit 1
+        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:
@@ -43,7 +43,7 @@ deploy:
       - release-github/*.deb
       - release-github/*.rpm
     on: #tags: true
-    all_branches: true
+      all_branches: true
   - provider: gcs
     edge: true
     bucket: "codesrv-ci.cdr.sh"
@@ -53,7 +53,15 @@ deploy:
     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
+      all_branches: true
+      condition: $TRAVIS_CPU_ARCH == amd64 && $TRAVIS_OS_NAME == linux
 
 cache:
   timeout: 600
diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh
@@ -52,9 +52,8 @@ bundle_code_server() {
   rsync out dist "$RELEASE_PATH"
 
   # For source maps and images.
-  mkdir -p "$RELEASE_PATH/src/browser/media"
+  rsync src/browser/media/ "$RELEASE_PATH/src/browser/media"
   mkdir -p "$RELEASE_PATH/src/browser/pages"
-  rsync src/browser/media "$RELEASE_PATH/src/browser/media"
   rsync src/browser/pages/*.html "$RELEASE_PATH/src/browser/pages"
 
   rsync yarn.lock "$RELEASE_PATH"
diff --git a/ci/build/build-static-pkgs.sh b/ci/build/build-static-pkgs.sh
@@ -17,8 +17,8 @@ main() {
   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"
+  nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION-$ARCH.deb"
+  nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION-$ARCH.rpm"
 }
 
 main "$@"
diff --git a/ci/dev/vscode.patch b/ci/dev/vscode.patch
@@ -50,7 +50,7 @@ index 7a2320d828..5768890636 100644
  yarnInstallBuildDependencies(); // node modules for watching, specific to host node version, not electron
 diff --git a/coder.js b/coder.js
 new file mode 100644
-index 0000000000..d0a8f37714
+index 0000000000..0170b47241
 --- /dev/null
 +++ b/coder.js
 @@ -0,0 +1,69 @@
@@ -83,7 +83,7 @@ index 0000000000..d0a8f37714
 +	"out-build/bootstrap-fork.js",
 +	"out-build/bootstrap-amd.js",
 +	"out-build/paths.js",
-+	'out-build/vs/**/*.{svg,png,html}',
++	'out-build/vs/**/*.{svg,png,html,ttf}',
 +	"!out-build/vs/code/browser/workbench/*.html",
 +	'!out-build/vs/code/electron-browser/**',
 +	"out-build/vs/base/common/performance.js",
diff --git a/ci/steps/publish-npm.sh b/ci/steps/publish-npm.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# 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
 main() {
   cd "$(dirname "$0")/../.."
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "code-server",
   "license": "MIT",
-  "version": "3.3.0-rc.4",
+  "version": "3.3.0-rc.7",
   "description": "Run VS Code on a remote server.",
   "homepage": "https://github.com/cdr/code-server",
   "bugs": {

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ main() {`
`17`	`17`	`local nfpm_config`
`18`	`18`	`nfpm_config=$(envsubst < ./ci/build/nfpm.yaml)`
`19`	`19`
`20`		`- nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION.deb"`
`21`		`- nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION.rpm"`
	`20`	`+ nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION-$ARCH.deb"`
	`21`	`+ nfpm pkg -f <(echo "$nfpm_config") --target release-github/code-server-"$VERSION-$ARCH.rpm"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`main "$@"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "code-server",`
`3`	`3`	`"license": "MIT",`
`4`		`- "version": "3.3.0-rc.4",`
	`4`	`+ "version": "3.3.0-rc.7",`
`5`	`5`	`"description": "Run VS Code on a remote server.",`
`6`	`6`	`"homepage": "https://github.com/cdr/code-server",`
`7`	`7`	`"bugs": {`