Skip to content

Commit f640e29

Browse files
authored
[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
1 parent 55d1a8b commit f640e29

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

WORKSPACE.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ defaultArgs:
1313
codeWebExtensionCommit: 7ff72a2938a7a06cbdf3964590f7e9b7525958f3
1414
xtermCommit: 8f10c5febf0162a3c2309076302f770fbad38fde
1515
noVerifyJBPlugin: false
16-
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.1.4.tar.gz"
16+
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.tar.gz"
1717
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz"
1818
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.tar.gz"
1919
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz"

dev/preview/workflow/preview/patch-ide-configmap.js

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ function replaceImage(image) {
99
return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
1010
}
1111

12+
// TODO(hw): remove me
13+
function replaceImage2(image) {
14+
if (image.includes("jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest")) {
15+
return image.replace("gitpod-dev-artifact", "gitpod-core-dev");
16+
}
17+
return image;
18+
}
19+
1220
for (let ide in json.ideOptions.options) {
1321
if (
1422
["clion", "goland", "intellij", "phpstorm", "pycharm", "rider", "rubymine", "webstorm", "rustrover"].includes(
@@ -21,6 +29,13 @@ for (let ide in json.ideOptions.options) {
2129
return version;
2230
});
2331
}
32+
33+
// TODO(hw): remove me
34+
if (["intellij"].includes(ide)) {
35+
json.ideOptions.options[ide].pluginImage = replaceImage2(json.ideOptions.options[ide].pluginImage);
36+
json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage2);
37+
}
38+
2439
if (["code", "code1_85"].includes(ide)) {
2540
json.ideOptions.options[ide].image = replaceImage(json.ideOptions.options[ide].image);
2641
json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage);

install/installer/pkg/components/ide-service/ide-configmap.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@
154154
"label": "Ultimate",
155155
"image": "{{.Repository}}/ide/intellij:{{.WorkspaceVersions.Workspace.DesktopIdeImages.IntelliJImage.Version}}",
156156
"latestImage": "{{.ResolvedJBImageLatest.IntelliJ}}",
157-
"pluginImage": "{{.JetBrainsPluginImage}}",
157+
"pluginImage": "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
158158
"pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
159159
"imageLayers": [
160-
"{{.JetBrainsPluginImage}}",
160+
"{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
161161
"{{.JetBrainsLauncherImage}}"
162162
],
163163
"latestImageLayers": [

0 commit comments

Comments
 (0)