fixup! Automate draft release

Author: nhooyr

ci/README.md

@@ -8,14 +8,15 @@ Any file and directory added into this tree should be documented here.
 
 ## Publishing a release
 
+Make sure you have `$GITHUB_TOKEN` set and [hub](https://github.com/github/hub) installed.
+
 1. Update the version of code-server in `package.json` and push a commit
-1. CI will run and generate the `npm-package` and `release-packages` artifacts on the GH actions workflow
-   1. Wait for this to complete
-1. Ensure `$GITHUB_TOKEN` is set
-1. Run `yarn release:github-draft` to download the artifacts into `./release-packages` and
-   open your `$EDITOR` with the release notes template
+1. GitHub actions will generate the `npm-package` and `release-packages` artifacts
+1. Run `yarn release:github-draft` to create a GitHub draft release from the template with
+   the updated version.
    1. Summarize the major changes in the release notes and link to the relevant issues.
-   1. Exit your `$EDITOR` and a draft release will be created on github
+1. Wait for the artifacts in step 2 to build
+1. Run `yarn release:github-assets` to download the artifacts and then upload them to the draft release
 1. Run some basic sanity tests on one of the released packages
 1. Publish the release
    1. CI will automatically grab the artifacts and then
@@ -78,9 +79,11 @@ You can disable minification by setting `MINIFY=`.
 - [./build/code-server-nfpm.sh](./build/code-server-nfpm.sh)
   - Entrypoint script for code-server for .deb and .rpm
 - [./build/release-github-draft.sh](./build/release-github-draft.sh) (`yarn release:github-draft`)
-  - Downloads the release-package artifact for the current commit from CI
-  - Uses [hub](https://github.com/github/hub) to create a draft release with the artifacts and
-    opens your `$EDITOR` to edit with a default template.
+  - Uses [hub](https://github.com/github/hub) to create a draft release with a template description
+- [./build/release-github-assets.sh](./build/release-github-assets.sh) (`yarn release:github-assets`)
+  - Downloads the release-package artifacts for the current commit from CI
+  - Uses [hub](https://github.com/github/hub) to upload the artifacts to the release
+    specified in `package.json`
 
 ## release-container
 

ci/build/release-github-assets.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Downloads the release artifacts from CI for the current
+# commit and then uploads them to the release with the version
+# in package.json.
+# You will need $GITHUB_TOKEN set.
+
+main() {
+  cd "$(dirname "$0")/../.."
+  source ./ci/lib.sh
+
+  download_artifact release-packages ./release-packages
+  local assets=(./release-packages/*)
+  for i in "${!assets[@]}"; do
+    assets[$i]="--attach=${assets[$i]}"
+  done
+  EDITOR=true hub release edit --draft "${assets[@]}" "v$(pkg_json_version)"
+}
+
+main "$@"

ci/build/release-github-draft.sh

@@ -1,22 +1,14 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# This script downloads the release artifacts from CI for the current
-# commit and then uses hub to create a draft release with them attached
-# for the current version against the current commit.
-# You will need $GITHUB_TOKEN set.
+# Creates a draft release with the template for the version in package.json
 
 main() {
   cd "$(dirname "$0")/../.."
   source ./ci/lib.sh
 
-  download_artifact release-packages ./release-packages
-  local assets=(./release-packages/*)
-  for i in "${!assets[@]}"; do
-    assets[$i]="--attach=${assets[$i]}"
-  done
   hub release create \
-    --edit --file - \
+    --file - \
     --draft "${assets[@]}" "v$(pkg_json_version)" << EOF
 v$(pkg_json_version)
 

ci/dev/lint.sh

@@ -7,7 +7,7 @@ main() {
   eslint --max-warnings=0 --fix $(git ls-files "*.ts" "*.tsx" "*.js")
   stylelint $(git ls-files "*.css")
   tsc --noEmit
-  shellcheck -e SC2046,SC2164 $(git ls-files "*.sh")
+  shellcheck -e SC2046,SC2164,SC2154 $(git ls-files "*.sh")
 }
 
 main "$@"

package.json

@@ -18,6 +18,7 @@
     "release": "./ci/build/build-release.sh",
     "release:static": "./ci/build/build-static-release.sh",
     "release:github-draft": "./ci/build/release-github-draft.sh",
+    "release:github-assets": "./ci/build/release-github-assets.sh",
     "test:static-release": "./ci/build/test-static-release.sh",
     "package": "./ci/build/build-packages.sh",
     "_____": "",