[JetBrains] force upgrade IntelliJ IDEA to 2024.2 (#20120)

* [JetBrains] force upgrade intelliJ to `2024.2` * Force append a version * Force use latet backend-plugin * Pin backend-plugin version * fix preview env * 1 * Address feedback
gitpod-io · Aug 15, 2024 · f640e29 · f640e29
1 parent 55d1a8b
commit f640e29
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
@@ -13,7 +13,7 @@ defaultArgs:
   codeWebExtensionCommit: 7ff72a2938a7a06cbdf3964590f7e9b7525958f3
   xtermCommit: 8f10c5febf0162a3c2309076302f770fbad38fde
   noVerifyJBPlugin: false
-  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.1.4.tar.gz"
+  intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.tar.gz"
   golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz"
   pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.tar.gz"
   phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz"

diff --git a/dev/preview/workflow/preview/patch-ide-configmap.js b/dev/preview/workflow/preview/patch-ide-configmap.js
@@ -9,6 +9,14 @@ function replaceImage(image) {
     return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
 }
 
+// TODO(hw): remove me
+function replaceImage2(image) {
+    if (image.includes("jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest")) {
+        return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
+    }
+    return image;
+}
+
 for (let ide in json.ideOptions.options) {
     if (
         ["clion", "goland", "intellij", "phpstorm", "pycharm", "rider", "rubymine", "webstorm", "rustrover"].includes(
@@ -21,6 +29,13 @@ for (let ide in json.ideOptions.options) {
             return version;
         });
     }
+
+    // TODO(hw): remove me
+    if (["intellij"].includes(ide)) {
+        json.ideOptions.options[ide].pluginImage = replaceImage2(json.ideOptions.options[ide].pluginImage);
+        json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage2);
+    }
+
     if (["code", "code1_85"].includes(ide)) {
         json.ideOptions.options[ide].image = replaceImage(json.ideOptions.options[ide].image);
         json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage);

diff --git a/install/installer/pkg/components/ide-service/ide-configmap.json b/install/installer/pkg/components/ide-service/ide-configmap.json
@@ -154,10 +154,10 @@
         "label": "Ultimate",
         "image": "{{.Repository}}/ide/intellij:{{.WorkspaceVersions.Workspace.DesktopIdeImages.IntelliJImage.Version}}",
         "latestImage": "{{.ResolvedJBImageLatest.IntelliJ}}",
-        "pluginImage": "{{.JetBrainsPluginImage}}",
+        "pluginImage": "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
         "pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
         "imageLayers": [
-          "{{.JetBrainsPluginImage}}",
+          "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
           "{{.JetBrainsLauncherImage}}"
         ],
         "latestImageLayers": [