plz work

Author: jsjoeio

.github/workflows/ci.yaml

@@ -181,6 +181,8 @@ jobs:
         run: yarn publish:npm:dev
         env:
           TAG: ${{ github.event.number }}-${{ github.event.pull_request.head.sha }}
+          # We tag with the GitHub PR number
+          NPM_TAG: ${ github.event.number }
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/npm-dev.yaml

@@ -20,6 +20,7 @@ jobs:
       - name: Run ./ci/steps/publish-npm-dev.sh
         run: ./ci/steps/publish-npm-dev.sh
         env:
-          TAG: "beta"
+          TAG: ${{ github.event.number }}-${{ github.event.pull_request.head.sha }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TAG: "beta"
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

ci/steps/publish-npm-dev.sh

@@ -6,6 +6,12 @@ main() {
   source ./ci/lib.sh
   source ./ci/steps/steps-lib.sh
 
+  # We need VERSION to update the package.json
+  if ! is_env_var_set "TAG"; then
+    echo "TAG is not set. Cannot publish to npm without setting a tag."
+    exit 1
+  fi
+
   # We need TAG to know what to publish under on npm
   if ! is_env_var_set "TAG"; then
     echo "TAG is not set. Cannot publish to npm without setting a tag."
@@ -24,6 +30,11 @@ main() {
     exit 1
   fi
 
+  if ! is_env_var_set "NPM_TAG"; then
+    echo "NPM_TAG is not set. This is needed for tagging the npm release."
+    exit 1
+  fi
+
   echo "using tag: $TAG"
 
   if [[ ${CI-} ]]; then
@@ -41,7 +52,12 @@ main() {
   # There are two things that need to happen
   # in order to publish on npm, we need to change the version
   # and possibly change the tag
-  yarn publish --non-interactive release --tag "$TAG"
+  pushd release
+  # This modifes the version in the package.json
+  npm version "$VERSION-$TAG"
+  popd
+
+  yarn publish --non-interactive release --tag "$NPM_TAG"
 }
 
 main "$@"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-server",
   "license": "MIT",
-  "version": "4.0.1-4769-cbb934c72ccf101aebb6827af4a045ac9063a911",
+  "version": "4.0.1",
   "description": "Run VS Code on a remote server.",
   "homepage": "https://github.com/cdr/code-server",
   "bugs": {