From 505f07a9bcdf22047e755f02621308f863c9c714 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Tue, 1 Nov 2022 10:16:30 -0700
Subject: [PATCH] fix: minor fixes related to release (#5732)

* fix: use * for test plugin engines

This removes the need to update this version with every version change.

* refactor: use npm-package in release assets

This adds a new job to `release.yaml` to upload the `npm-package` to the
release assets which will also allow us to download it in the
`publish.yaml` workflow.

* docs: update release instructions

* fixup!: use package.tar.gz
---
 .github/workflows/publish.yaml          | 14 ++++++--------
 .github/workflows/release.yaml          | 21 +++++++++++++++++++++
 docs/MAINTAINING.md                     |  3 +--
 test/unit/node/test-plugin/package.json |  2 +-
 4 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 569a9384d..a5bf2d11c 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -28,15 +28,13 @@ jobs:
         id: version
         run: echo "::set-output name=version::$(jq -r .version package.json)"
 
-      - name: Download artifact
-        uses: dawidd6/action-download-artifact@v2
-        id: download
+      - name: Download npm package from release artifacts
+        uses: robinraju/release-downloader@v1.5
         with:
-          branch: release/v${{ steps.version.outputs.version }}
-          workflow: build.yaml
-          workflow_conclusion: completed
-          name: "npm-package"
-          path: release-npm-package
+          repository: "coder/code-server"
+          tag: v${{ steps.version.outputs.version }}
+          fileName: "package.tar.gz"
+          out-file-path: "release-npm-package"
 
       - name: Publish npm package and tag with "latest"
         run: yarn publish:npm
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 61ec8a5ba..2d61cc07d 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -249,3 +249,24 @@ jobs:
           draft: true
           discussion_category_name: "📣 Announcements"
           files: ./release-packages/*
+
+  npm-package:
+    name: Upload npm package
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    steps:
+      - name: Download artifacts
+        uses: dawidd6/action-download-artifact@v2
+        id: download
+        with:
+          branch: ${{ github.ref }}
+          workflow: build.yaml
+          workflow_conclusion: completed
+          check_artifacts: true
+          name: npm-package
+
+      - uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          discussion_category_name: "📣 Announcements"
+          files: ./package.tar.gz
diff --git a/docs/MAINTAINING.md b/docs/MAINTAINING.md
index 3300cc0d6..6956bb669 100644
--- a/docs/MAINTAINING.md
+++ b/docs/MAINTAINING.md
@@ -141,8 +141,7 @@ changelog](https://github.com/emacs-mirror/emacs/blob/master/etc/NEWS).
 
 ### Publishing a release
 
-1. Create a new branch called `release/v0.0.0` (replace 0s with actual version aka v4.5.0)
-   1. If you don't do this, the `npm-brew` GitHub workflow will fail. It looks for the release artifacts under the branch pattern.
+1. Create a new branch called `release`
 1. Run `yarn release:prep`
 1. Bump chart version in `Chart.yaml`.
 1. Summarize the major changes in the `CHANGELOG.md`
diff --git a/test/unit/node/test-plugin/package.json b/test/unit/node/test-plugin/package.json
index 817a883e9..0247d60be 100644
--- a/test/unit/node/test-plugin/package.json
+++ b/test/unit/node/test-plugin/package.json
@@ -3,7 +3,7 @@
   "name": "test-plugin",
   "version": "1.0.0",
   "engines": {
-    "code-server": "^4.8.1"
+    "code-server": "*"
   },
   "main": "out/index.js",
   "devDependencies": {