[code] Update code to 1.86.1 (#19404)

* Delete 1.85 ide option

* Add invalid default ide test

* test delete 1.85 ide option

* Revert "test delete 1.85 ide option"

This reverts commit d705451.

* Update code to 1.86.1

* Revert "Revert "test delete 1.85 ide option""

This reverts commit 637c8a1.

Author: jeanp413

WORKSPACE.yaml

@@ -7,8 +7,8 @@ defaultArgs:
   publishToNPM: true
   publishToJBMarketplace: true
   localAppVersion: unknown
-  codeCommit: 58bb230c0b29056eacd49010e91cd71567d667fd
-  codeVersion: 1.86.0
+  codeCommit: 293532918ec041aafb8cfd2f0f975dd958ccbf64
+  codeVersion: 1.86.1
   codeQuality: stable
   noVerifyJBPlugin: false
   intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2023.3.3.tar.gz"

components/ide-service/pkg/server/testdata/resolve_ws_config_regular_code_invalid.golden

@@ -0,0 +1,8 @@
+{
+  "Resp": {
+      "supervisor_image": "eu.gcr.io/gitpod-core-dev/build/supervisor:commit-ff38b98b7dde4929159bcaeec68d178898dc2139",
+      "web_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:commit-d6329814c2aa34c414574fd0d1301447d6fe82c9",
+      "ide_settings": "{\"defaultIde\":\"code\"}\n"
+  },
+  "Err": ""
+}

components/ide-service/pkg/server/testdata/resolve_ws_config_regular_code_invalid.json

@@ -0,0 +1,5 @@
+{
+  "context": "{\"isFile\":false,\"path\":\"\",\"title\":\"gitpod-io/empty \",\"revision\":\"\",\"repository\":{\"cloneUrl\":\"https://github.com/gitpod-io/empty.git\",\"host\":\"github.com\",\"name\":\"empty\",\"owner\":\"gitpod-io\",\"private\":false},\"normalizedContextURL\":\"https://github.com/gitpod-io/empty\",\"checkoutLocation\":\"empty\"}",
+  "ide_settings": "{\"settingVersion\":\"2.0\",\"defaultIde\":\"invalid\",\"useLatestVersion\":false}",
+  "workspace_config": "{\"ports\":[],\"tasks\":[],\"image\":\"docker.io/gitpod/workspace-full:latest\",\"_origin\":\"default\"}"
+}

components/ide/code/leeway.Dockerfile

@@ -1,12 +1,25 @@
 # Copyright (c) 2020 Gitpod GmbH. All rights reserved.
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
+FROM gitpod/openvscode-server-linux-build-agent:centos7-devtoolset8-x64 as dependencies_builder
+
+ARG CODE_COMMIT
+
+RUN mkdir /gp-code \
+    && cd /gp-code \
+    && git init \
+    && git remote add origin https://github.com/gitpod-io/openvscode-server \
+    && git fetch origin $CODE_COMMIT --depth=1 \
+    && git reset --hard FETCH_HEAD
+WORKDIR /gp-code
+RUN yarn --cwd remote --frozen-lockfile --network-timeout 180000
 
 FROM gitpod/openvscode-server-linux-build-agent:focal-x64 as code_builder
 
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
 ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1
 ENV VSCODE_ARCH=x64
+ENV NPM_REGISTRY=https://registry.yarnpkg.com
 
 ARG CODE_COMMIT
 ARG CODE_QUALITY
@@ -29,6 +42,10 @@ RUN mkdir -p .build \
     && yarn --cwd build --frozen-lockfile --network-timeout 180000 \
     && ./build/azure-pipelines/linux/install.sh
 
+# copy remote dependencies build in dependencies_builder image
+RUN rm -rf remote/node_modules/
+COPY --from=dependencies_builder /gp-code/remote/node_modules/ /gp-code/remote/node_modules/
+
 # check that the provided codeVersion is the correct one for the given codeCommit
 RUN commitVersion=$(cat package.json | jq -r .version) \
     && if [ "$commitVersion" != "$CODE_VERSION" ]; then echo "Code version mismatch: $commitVersion != $CODE_VERSION"; exit 1; fi

install/installer/pkg/components/workspace/ide/constants.go

@@ -6,7 +6,7 @@ package ide
 
 const (
 	CodeIDEImage                  = "ide/code"
-	CodeIDEImageStableVersion     = "commit-fc97f55eae648b06f4cbd03e67c52f229de17023" // stable version that will be updated manually on demand
+	CodeIDEImageStableVersion     = "commit-3bed9d52b23c62f2902136fdbd746a3a9c901236" // stable version that will be updated manually on demand
 	Code1_85IDEImageStableVersion = "commit-cb1173f2a457633550a7fdc89af86d8d4da51876"
 	CodeHelperIDEImage            = "ide/code-codehelper"
 	CodeWebExtensionImage         = "ide/gitpod-code-web"