From a958055d69e80ac5bd1ab662d60a0b159334b4e6 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 11:51:36 -0700
Subject: [PATCH 01/26] refactor: remove keytar dep in cross-compile

---
 .github/workflows/release.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 119ace640203..7f43abba1855 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -172,9 +172,6 @@ jobs:
         env:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
-      - name: Install keytar dependencies
-        run: sudo apt install -y libsecret-1-dev
-
       - name: Download npm package
         uses: actions/download-artifact@v3
         with:

From fb827b6d2c51da5d84c1e8ce8111cd28010e82cf Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:02:13 -0700
Subject: [PATCH 02/26] refactor: try other keytar package

---
 .github/workflows/release.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7f43abba1855..6e978d38e4d7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -172,6 +172,11 @@ jobs:
         env:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
+      - name: Install keytar dependencies
+        run: sudo apt install -y $PACKAGE
+        env:
+          PACKAGE: ${{ format('libsecret-1-dev:{0}', matrix.arch) }}
+
       - name: Download npm package
         uses: actions/download-artifact@v3
         with:

From 4e97fb9cb5c583cbdfb902e205e402e611d5287a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:30:02 -0700
Subject: [PATCH 03/26] refactor: remove keytar step in cross-compile

---
 .github/workflows/release.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6e978d38e4d7..7f43abba1855 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -172,11 +172,6 @@ jobs:
         env:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
-      - name: Install keytar dependencies
-        run: sudo apt install -y $PACKAGE
-        env:
-          PACKAGE: ${{ format('libsecret-1-dev:{0}', matrix.arch) }}
-
       - name: Download npm package
         uses: actions/download-artifact@v3
         with:

From 679bdf2867b4768d854608d0feb05dbad0c7c947 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:33:07 -0700
Subject: [PATCH 04/26] fix: manually remove keytar

---
 .github/workflows/release.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7f43abba1855..329ca86972f0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -196,6 +196,14 @@ jobs:
           TAG="${{ inputs.version || github.ref_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
+      # NOTE@jsjoeio - the dependencies needed for this
+      # aren't supported on this architecture so we remove
+      # it manually.
+      - name: Remove keytar
+        run: |
+          cd ./release-standalone/lib/vscode
+          npm uninstall keytar
+
       - name: Build packages with nfpm
         env:
           VERSION: ${{ env.VERSION }}

From 9b37897899d88682df9d16ff7de3666be4a8fc5e Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:41:59 -0700
Subject: [PATCH 05/26] try this first

---
 .github/workflows/release.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 329ca86972f0..a9754996253e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -172,6 +172,9 @@ jobs:
         env:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
+      - name: Install keytar dependencies
+        run: sudo apt install -y libsecret-1-dev:armhf
+
       - name: Download npm package
         uses: actions/download-artifact@v3
         with:
@@ -199,10 +202,10 @@ jobs:
       # NOTE@jsjoeio - the dependencies needed for this
       # aren't supported on this architecture so we remove
       # it manually.
-      - name: Remove keytar
-        run: |
-          cd ./release-standalone/lib/vscode
-          npm uninstall keytar
+      # - name: Remove keytar
+      #   run: |
+      #     cd ./release-standalone/lib/vscode
+      #     npm uninstall keytar
 
       - name: Build packages with nfpm
         env:

From 5c566b0c0126da1d3baa2f3c69e26fe1cc63fe93 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:45:13 -0700
Subject: [PATCH 06/26] I think this is it

---
 .github/workflows/release.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a9754996253e..83fb2e38b5b6 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -141,8 +141,10 @@ jobs:
         include:
           - prefix: aarch64-linux-gnu
             arch: arm64
+            libArch: arm64
           - prefix: arm-linux-gnueabihf
             arch: armv7l
+            libArch: armhf
 
     env:
       AR: ${{ format('{0}-ar', matrix.prefix) }}
@@ -173,7 +175,9 @@ jobs:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
       - name: Install keytar dependencies
-        run: sudo apt install -y libsecret-1-dev:armhf
+        run: sudo apt install -y $PACKAGE
+        env:
+          PACKAGE: ${{ format('libsecret-1-dev:{0}', matrix.libArch) }}
 
       - name: Download npm package
         uses: actions/download-artifact@v3

From d3e45dd45abcc303db0e9886d0feaf366f22f46d Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:50:09 -0700
Subject: [PATCH 07/26] Revert "I think this is it"

This reverts commit 5c566b0c0126da1d3baa2f3c69e26fe1cc63fe93.
---
 .github/workflows/release.yaml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 83fb2e38b5b6..a9754996253e 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -141,10 +141,8 @@ jobs:
         include:
           - prefix: aarch64-linux-gnu
             arch: arm64
-            libArch: arm64
           - prefix: arm-linux-gnueabihf
             arch: armv7l
-            libArch: armhf
 
     env:
       AR: ${{ format('{0}-ar', matrix.prefix) }}
@@ -175,9 +173,7 @@ jobs:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
       - name: Install keytar dependencies
-        run: sudo apt install -y $PACKAGE
-        env:
-          PACKAGE: ${{ format('libsecret-1-dev:{0}', matrix.libArch) }}
+        run: sudo apt install -y libsecret-1-dev:armhf
 
       - name: Download npm package
         uses: actions/download-artifact@v3

From a2ff4534e4a8742e4cd932522311f9735a269c4d Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:50:44 -0700
Subject: [PATCH 08/26] okay this is it

---
 .github/workflows/release.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a9754996253e..29f8dc6c2647 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -202,10 +202,10 @@ jobs:
       # NOTE@jsjoeio - the dependencies needed for this
       # aren't supported on this architecture so we remove
       # it manually.
-      # - name: Remove keytar
-      #   run: |
-      #     cd ./release-standalone/lib/vscode
-      #     npm uninstall keytar
+      - name: Remove keytar
+        run: |
+          cd ./release-standalone/lib/vscode
+          npm uninstall keytar
 
       - name: Build packages with nfpm
         env:

From e4388cca08063061198cc74cc7617a9fbc461e2d Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 12:53:22 -0700
Subject: [PATCH 09/26] fixup

---
 .github/workflows/release.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 29f8dc6c2647..329ca86972f0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -172,9 +172,6 @@ jobs:
         env:
           PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
 
-      - name: Install keytar dependencies
-        run: sudo apt install -y libsecret-1-dev:armhf
-
       - name: Download npm package
         uses: actions/download-artifact@v3
         with:

From 4a922aecd59654832b4cb5ff8ecb7386737e583e Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:01:31 -0700
Subject: [PATCH 10/26] try legacy peer

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 329ca86972f0..7c0761cfce0c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -202,7 +202,7 @@ jobs:
       - name: Remove keytar
         run: |
           cd ./release-standalone/lib/vscode
-          npm uninstall keytar
+          npm uninstall keytar --legacy-peer-deps
 
       - name: Build packages with nfpm
         env:

From cfa03cbd7dffdbb326845635eb3d79301ee67b43 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:04:58 -0700
Subject: [PATCH 11/26] remove keytar before standalone

---
 .github/workflows/release.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7c0761cfce0c..ad1b6cedf5af 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -180,6 +180,14 @@ jobs:
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
 
+      # NOTE@jsjoeio - the dependencies needed for this
+      # aren't supported on this architecture so we remove
+      # it manually.
+      - name: Remove keytar
+        run: |
+          cd ./release-standalone/lib/vscode
+          npm uninstall keytar --legacy-peer-deps
+
       - name: Build standalone release
         run: yarn release:standalone
 
@@ -196,14 +204,6 @@ jobs:
           TAG="${{ inputs.version || github.ref_name }}"
           echo "VERSION=${TAG#v}" >> $GITHUB_ENV
 
-      # NOTE@jsjoeio - the dependencies needed for this
-      # aren't supported on this architecture so we remove
-      # it manually.
-      - name: Remove keytar
-        run: |
-          cd ./release-standalone/lib/vscode
-          npm uninstall keytar --legacy-peer-deps
-
       - name: Build packages with nfpm
         env:
           VERSION: ${{ env.VERSION }}

From d25d4fe255c271dbbef5c4249e177c401a84e78a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:08:28 -0700
Subject: [PATCH 12/26] wrong path

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ad1b6cedf5af..42ac7e740ffb 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -185,7 +185,7 @@ jobs:
       # it manually.
       - name: Remove keytar
         run: |
-          cd ./release-standalone/lib/vscode
+          cd ./lib/vscode
           npm uninstall keytar --legacy-peer-deps
 
       - name: Build standalone release

From 73225bb2b4aa0a3c3a7ab909fbe19fd256d456ab Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:34:14 -0700
Subject: [PATCH 13/26] maybe

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 42ac7e740ffb..a3b0b8d1c7e2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -185,7 +185,7 @@ jobs:
       # it manually.
       - name: Remove keytar
         run: |
-          cd ./lib/vscode
+          cd ./release/lib/vscode
           npm uninstall keytar --legacy-peer-deps
 
       - name: Build standalone release

From aedd3efe0d66172bed944f42e72e90bd1d8f1800 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:56:19 -0700
Subject: [PATCH 14/26] revert: change *npm* back to npm*

---
 ci/build/npm-postinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh
index b407a03dbfbb..4c17e8152ee7 100755
--- a/ci/build/npm-postinstall.sh
+++ b/ci/build/npm-postinstall.sh
@@ -128,7 +128,7 @@ install_with_yarn_or_npm() {
   # NOTE@edvincent: We want to keep using the package manager that the end-user was using to install the package.
   # This also ensures that when *we* run `yarn` in the development process, the yarn.lock file is used.
   case "${npm_config_user_agent-}" in
-    *npm*)
+    npm*)
       if [ -f "yarn.lock" ]; then
         echo "yarn.lock file present, running in development mode. use yarn to install code-server!"
         exit 1

From 00ad39e61daf50ad30dcf6fe5bc22d18f620c152 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:56:48 -0700
Subject: [PATCH 15/26] revert: don't uninstall keytar

---
 .github/workflows/release.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a3b0b8d1c7e2..7f43abba1855 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -180,14 +180,6 @@ jobs:
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
 
-      # NOTE@jsjoeio - the dependencies needed for this
-      # aren't supported on this architecture so we remove
-      # it manually.
-      - name: Remove keytar
-        run: |
-          cd ./release/lib/vscode
-          npm uninstall keytar --legacy-peer-deps
-
       - name: Build standalone release
         run: yarn release:standalone
 

From 8fcb7335cf6328041642f307ad06bda20a572fb5 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 13:59:39 -0700
Subject: [PATCH 16/26] fix: use npm run standalone-release

---
 .github/workflows/release.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7f43abba1855..187eb1a8efcf 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -70,7 +70,7 @@ jobs:
       # NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
       # file when running inside a docker container.
       - name: Build standalone release
-        run: source scl_source enable devtoolset-9 && yarn release:standalone
+        run: source scl_source enable devtoolset-9 && npm run release:standalone
 
       - name: Fetch dependencies from cache
         id: cache-node-modules
@@ -180,6 +180,8 @@ jobs:
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
 
+      # NOTE@jsjoeio - npm fails here 
+      # so use yarn
       - name: Build standalone release
         run: yarn release:standalone
 
@@ -236,7 +238,7 @@ jobs:
         run: tar -xzf package.tar.gz
 
       - name: Build standalone release
-        run: yarn release:standalone
+        run: npm run release:standalone
 
       - name: Fetch dependencies from cache
         id: cache-node-modules

From 7c10b83031ecd03b5ef7435efdbcea6cf9e2f664 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 14:00:41 -0700
Subject: [PATCH 17/26] fixup formatting

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 187eb1a8efcf..139a561b9acd 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -180,7 +180,7 @@ jobs:
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
 
-      # NOTE@jsjoeio - npm fails here 
+      # NOTE@jsjoeio - npm fails here
       # so use yarn
       - name: Build standalone release
         run: yarn release:standalone

From 9fec20328119f2868301b19e2f85e32d58368462 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 14:12:46 -0700
Subject: [PATCH 18/26] Revert "refactor: remove yarn.lock steps (#5850)"

This reverts commit 907747d3949301d8836e71938940f6275b016062.
---
 ci/build/build-release.sh            | 3 +++
 ci/build/build-standalone-release.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/build/build-release.sh b/ci/build/build-release.sh
index 8240a2f22b6e..c812668580fb 100755
--- a/ci/build/build-release.sh
+++ b/ci/build/build-release.sh
@@ -56,6 +56,7 @@ bundle_code_server() {
   }
 EOF
   ) > "$RELEASE_PATH/package.json"
+  rsync yarn.lock "$RELEASE_PATH"
   mv npm-shrinkwrap.json "$RELEASE_PATH"
 
   rsync ci/build/npm-postinstall.sh "$RELEASE_PATH/postinstall.sh"
@@ -96,10 +97,12 @@ bundle_vscode() {
     "$VSCODE_SRC_PATH/remote/package.json" \
     "$VSCODE_SRC_PATH/package.json" > "$VSCODE_OUT_PATH/package.json"
 
+  rsync "$VSCODE_SRC_PATH/remote/yarn.lock" "$VSCODE_OUT_PATH/yarn.lock"
   mv "$VSCODE_SRC_PATH/remote/npm-shrinkwrap.json" "$VSCODE_OUT_PATH/npm-shrinkwrap.json"
 
   # Include global extension dependencies as well.
   rsync "$VSCODE_SRC_PATH/extensions/package.json" "$VSCODE_OUT_PATH/extensions/package.json"
+  rsync "$VSCODE_SRC_PATH/extensions/yarn.lock" "$VSCODE_OUT_PATH/extensions/yarn.lock"
   mv "$VSCODE_SRC_PATH/extensions/npm-shrinkwrap.json" "$VSCODE_OUT_PATH/extensions/npm-shrinkwrap.json"
   rsync "$VSCODE_SRC_PATH/extensions/postinstall.mjs" "$VSCODE_OUT_PATH/extensions/postinstall.mjs"
 }
diff --git a/ci/build/build-standalone-release.sh b/ci/build/build-standalone-release.sh
index a297b90449b0..12bda50be993 100755
--- a/ci/build/build-standalone-release.sh
+++ b/ci/build/build-standalone-release.sh
@@ -10,7 +10,7 @@ main() {
 
   source ./ci/lib.sh
 
-  rsync "$RELEASE_PATH/" "$RELEASE_PATH-standalone"
+  rsync --exclude yarn.lock "$RELEASE_PATH/" "$RELEASE_PATH-standalone"
   RELEASE_PATH+=-standalone
 
   # We cannot find the path to node from $PATH because yarn shims a script to ensure

From 893d071bf8c40da934680fd612da74845b9d0e72 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 14:14:04 -0700
Subject: [PATCH 19/26] fixup: remove the --exclude

---
 ci/build/build-standalone-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build/build-standalone-release.sh b/ci/build/build-standalone-release.sh
index 12bda50be993..a297b90449b0 100755
--- a/ci/build/build-standalone-release.sh
+++ b/ci/build/build-standalone-release.sh
@@ -10,7 +10,7 @@ main() {
 
   source ./ci/lib.sh
 
-  rsync --exclude yarn.lock "$RELEASE_PATH/" "$RELEASE_PATH-standalone"
+  rsync "$RELEASE_PATH/" "$RELEASE_PATH-standalone"
   RELEASE_PATH+=-standalone
 
   # We cannot find the path to node from $PATH because yarn shims a script to ensure

From 8469acbaa0a243a0243a784c6851b0f9edd6049a Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Thu, 8 Dec 2022 14:15:34 -0700
Subject: [PATCH 20/26] refactor: remove yarn.lock check

---
 ci/build/npm-postinstall.sh | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh
index 4c17e8152ee7..0300440d0854 100755
--- a/ci/build/npm-postinstall.sh
+++ b/ci/build/npm-postinstall.sh
@@ -129,23 +129,13 @@ install_with_yarn_or_npm() {
   # This also ensures that when *we* run `yarn` in the development process, the yarn.lock file is used.
   case "${npm_config_user_agent-}" in
     npm*)
-      if [ -f "yarn.lock" ]; then
-        echo "yarn.lock file present, running in development mode. use yarn to install code-server!"
-        exit 1
-      else
-        # HACK: NPM's use of semver doesn't like resolving some peerDependencies that vscode (upstream) brings in the form of pre-releases.
-        # The legacy behavior doesn't complain about pre-releases being used, falling back to that for now.
-        # See https://github.com//pull/5071
-        npm install --unsafe-perm --legacy-peer-deps --omit=dev
-      fi
+      # HACK: NPM's use of semver doesn't like resolving some peerDependencies that vscode (upstream) brings in the form of pre-releases.
+      # The legacy behavior doesn't complain about pre-releases being used, falling back to that for now.
+      # See https://github.com//pull/5071
+      npm install --unsafe-perm --legacy-peer-deps --omit=dev
       ;;
     yarn*)
-      if [ -f "yarn.lock" ]; then
-        yarn --production --frozen-lockfile --no-default-rc
-      else
-        echo "yarn.lock file not present, not running in development mode. use npm to install code-server!"
-        exit 1
-      fi
+      yarn --production --frozen-lockfile --no-default-rc
       ;;
     *)
       echo "Could not determine which package manager is being used to install code-server"

From 44339d50419951435702de4d677f743b56013cda Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 9 Dec 2022 15:34:09 -0700
Subject: [PATCH 21/26] try ddd in postinstall

---
 ci/build/npm-postinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh
index 0300440d0854..4e1a365a3759 100755
--- a/ci/build/npm-postinstall.sh
+++ b/ci/build/npm-postinstall.sh
@@ -132,7 +132,7 @@ install_with_yarn_or_npm() {
       # HACK: NPM's use of semver doesn't like resolving some peerDependencies that vscode (upstream) brings in the form of pre-releases.
       # The legacy behavior doesn't complain about pre-releases being used, falling back to that for now.
       # See https://github.com//pull/5071
-      npm install --unsafe-perm --legacy-peer-deps --omit=dev
+      npm install --unsafe-perm --legacy-peer-deps --omit=dev -ddd
       ;;
     yarn*)
       yarn --production --frozen-lockfile --no-default-rc

From 0455b1f0f3d6e7f06fa0789b0817ee45e8df09e4 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 9 Dec 2022 16:40:46 -0700
Subject: [PATCH 22/26] refactor: cache before release:standalone

---
 .github/workflows/release.yaml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 139a561b9acd..9d9b46ee48b3 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -67,11 +67,6 @@ jobs:
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
 
-      # NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
-      # file when running inside a docker container.
-      - name: Build standalone release
-        run: source scl_source enable devtoolset-9 && npm run release:standalone
-
       - name: Fetch dependencies from cache
         id: cache-node-modules
         uses: actions/cache@v3
@@ -81,6 +76,12 @@ jobs:
           restore-keys: |
             yarn-build-
 
+      # NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
+      # file when running inside a docker container.
+      - name: Build standalone release
+        run: source scl_source enable devtoolset-9 && npm run release:standalone
+
+
       - name: Install test dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
@@ -237,9 +238,6 @@ jobs:
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
 
-      - name: Build standalone release
-        run: npm run release:standalone
-
       - name: Fetch dependencies from cache
         id: cache-node-modules
         uses: actions/cache@v3
@@ -249,6 +247,9 @@ jobs:
           restore-keys: |
             yarn-build-
 
+      - name: Build standalone release
+        run: npm run release:standalone
+
       - name: Install test dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: SKIP_SUBMODULE_DEPS=1 yarn install

From 808b582130178ae08dcddb8c19bd84e457e769a6 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 9 Dec 2022 16:43:32 -0700
Subject: [PATCH 23/26] refactor: add os to cache key in release

---
 .github/workflows/release.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9d9b46ee48b3..73da28a07cf9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -72,9 +72,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: "**/node_modules"
-          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+          key: yarn-build-linux-amd64-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            yarn-build-
+            yarn-build-linux-amd64-
 
       # NOTE: && here is deliberate - GitHub puts each line in its own `.sh`
       # file when running inside a docker container.
@@ -243,9 +243,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: "**/node_modules"
-          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
+          key: yarn-build-macos-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
-            yarn-build-
+            yarn-build-macos-
 
       - name: Build standalone release
         run: npm run release:standalone

From cfdaa7f994126a76bf9ac4565b5ed65939e5d06e Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 12 Dec 2022 10:44:33 -0700
Subject: [PATCH 24/26] chore: formatting

---
 .github/workflows/release.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 124cb608df3a..85ea843b0b25 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -81,7 +81,6 @@ jobs:
       - name: Build standalone release
         run: source scl_source enable devtoolset-9 && npm run release:standalone
 
-
       - name: Install test dependencies
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile

From 4c77d3118ba52312f0c587780cc3a92275f2b187 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 12 Dec 2022 14:46:53 -0700
Subject: [PATCH 25/26] Update ci/build/npm-postinstall.sh

---
 ci/build/npm-postinstall.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/build/npm-postinstall.sh b/ci/build/npm-postinstall.sh
index 4e1a365a3759..0300440d0854 100755
--- a/ci/build/npm-postinstall.sh
+++ b/ci/build/npm-postinstall.sh
@@ -132,7 +132,7 @@ install_with_yarn_or_npm() {
       # HACK: NPM's use of semver doesn't like resolving some peerDependencies that vscode (upstream) brings in the form of pre-releases.
       # The legacy behavior doesn't complain about pre-releases being used, falling back to that for now.
       # See https://github.com//pull/5071
-      npm install --unsafe-perm --legacy-peer-deps --omit=dev -ddd
+      npm install --unsafe-perm --legacy-peer-deps --omit=dev
       ;;
     yarn*)
       yarn --production --frozen-lockfile --no-default-rc

From 0da120fa5d9483bd460c2633749cce5ae483b09c Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Mon, 12 Dec 2022 14:49:15 -0700
Subject: [PATCH 26/26] fixup: formatting

---
 .github/workflows/release.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index cf7cfbfd0c1e..5ba764c44d27 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -66,7 +66,7 @@ jobs:
 
       - name: Decompress npm package
         run: tar -xzf package.tar.gz
-        
+
       - name: Fetch dependencies from cache
         id: cache-node-modules
         uses: actions/cache@v3