Skip to content

Commit 8566114

Browse files
roboquatmustard-mh
andauthored
[JetBrains] Update IDE images to new build version (#20387)
* [JetBrains] Update IDE images to new build version * Remove `JetBrainsPluginImagePrevious` --------- Co-authored-by: Huiwen <[email protected]>
1 parent bb65be7 commit 8566114

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

WORKSPACE.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ defaultArgs:
2020
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.3.tar.gz"
2121
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.3.tar.gz"
2222
riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.1.4.tar.gz"
23-
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.2.3.tar.gz"
24-
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.2.5.tar.gz"
23+
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.3.tar.gz"
24+
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.3.tar.gz"
2525
jbBackendVersion: "latest"
2626
dockerVersion: "20.10.24"
2727
dockerComposeVersion: "2.27.0-gitpod.0"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ for (let ide in json.ideOptions.options) {
3838
}
3939

4040
// TODO(hw): remove me
41-
if (["intellij", "clion", "rustrover"].includes(ide)) {
41+
if (["intellij"].includes(ide)) {
4242
json.ideOptions.options[ide].pluginImage = replaceImage2(json.ideOptions.options[ide].pluginImage);
4343
json.ideOptions.options[ide].imageLayers = json.ideOptions.options[ide].imageLayers.map(replaceImage2);
4444
}

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -870,10 +870,10 @@
870870
"logo": "{{.IdeLogoBase}}/clionLogo.svg",
871871
"image": "{{.Repository}}/ide/clion:{{.WorkspaceVersions.Workspace.DesktopIdeImages.CLionImage.Version}}",
872872
"latestImage": "{{.ResolvedJBImageLatest.CLion}}",
873-
"pluginImage": "{{.JetBrainsPluginImagePrevious}}",
873+
"pluginImage": "{{.JetBrainsPluginImage}}",
874874
"pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
875875
"imageLayers": [
876-
"{{.JetBrainsPluginImagePrevious}}",
876+
"{{.JetBrainsPluginImage}}",
877877
"{{.JetBrainsLauncherImage}}"
878878
],
879879
"latestImageLayers": [
@@ -882,6 +882,14 @@
882882
],
883883
"allowPin": true,
884884
"versions": [
885+
{
886+
"version": "2024.2.3",
887+
"image": "{{.Repository}}/ide/clion:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827",
888+
"imageLayers": [
889+
"{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
890+
"{{.Repository}}/ide/jb-launcher:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827"
891+
]
892+
},
885893
{
886894
"version": "2024.2.2",
887895
"image": "{{.Repository}}/ide/clion:commit-c0c9b747905872fcade355a5347e4de98711a0a0",
@@ -947,10 +955,10 @@
947955
"logo": "{{.IdeLogoBase}}/rustroverLogo.svg",
948956
"image": "{{.Repository}}/ide/rustrover:{{.WorkspaceVersions.Workspace.DesktopIdeImages.RustRoverImage.Version}}",
949957
"latestImage": "{{.ResolvedJBImageLatest.RustRover}}",
950-
"pluginImage": "{{.JetBrainsPluginImagePrevious}}",
958+
"pluginImage": "{{.JetBrainsPluginImage}}",
951959
"pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
952960
"imageLayers": [
953-
"{{.JetBrainsPluginImagePrevious}}",
961+
"{{.JetBrainsPluginImage}}",
954962
"{{.JetBrainsLauncherImage}}"
955963
],
956964
"latestImageLayers": [
@@ -959,6 +967,14 @@
959967
],
960968
"allowPin": true,
961969
"versions": [
970+
{
971+
"version": "2024.2.5",
972+
"image": "{{.Repository}}/ide/rustrover:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827",
973+
"imageLayers": [
974+
"{{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6",
975+
"{{.Repository}}/ide/jb-launcher:commit-08d82bcac5ec4e6a3a6376b664c765f233dfd827"
976+
]
977+
},
962978
{
963979
"version": "2024.2.4",
964980
"image": "{{.Repository}}/ide/rustrover:commit-97baff58c516062d23b11c3c5eeeffc2113834df",

install/installer/pkg/components/ide-service/ide_config_configmap.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err
5858
CodeWebExtensionImage string
5959

6060
JetBrainsPluginImage string
61-
JetBrainsPluginImagePrevious string
6261
JetBrainsPluginLatestImage string
6362
JetBrainsPluginRiderImage string
6463
JetBrainsPluginLatestRiderImage string
@@ -68,9 +67,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err
6867
WorkspaceVersions versions.Components
6968
}
7069

71-
// {{.Repository}}/ide/jb-backend-plugin:commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6
72-
previousStableJetBrainsBackendPluginVersion := "commit-4c69ad0670cc4cfbf43910e1db700ad90acd5ac6"
73-
7470
configTmpl := ConfigTemplate{
7571
Repository: ctx.Config.Repository,
7672
IdeLogoBase: fmt.Sprintf("https://ide.%s/image/ide-logo", ctx.Config.Domain),
@@ -80,7 +76,6 @@ func GenerateIDEConfigmap(ctx *common.RenderContext) (*ide_config.IDEConfig, err
8076
CodeWebExtensionImage: ctx.ImageName(ctx.Config.Repository, ide.CodeWebExtensionImage, ctx.VersionManifest.Components.Workspace.CodeWebExtensionImage.Version),
8177

8278
JetBrainsPluginImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginImage.Version),
83-
JetBrainsPluginImagePrevious: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, previousStableJetBrainsBackendPluginVersion),
8479
JetBrainsPluginLatestImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestImage.Version),
8580
JetBrainsPluginRiderImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginRiderImage.Version),
8681
JetBrainsPluginLatestRiderImage: ctx.ImageName(ctx.Config.Repository, ide.JetBrainsBackendPluginImage, ctx.VersionManifest.Components.Workspace.DesktopIdeImages.JetBrainsBackendPluginLatestRiderImage.Version),

0 commit comments

Comments
 (0)