Skip to content

Commit ee9bda6

Browse files
mustard-mhroboquat
mustard-mh
and
roboquat
authored
Update stable JetBrains IDEs (#20180)
* [JetBrains] Update IDE images to new build version * Update how backend-plugin build --------- Co-authored-by: Robo Quat <[email protected]>
1 parent 8e8a5db commit ee9bda6

File tree

4 files changed

+92
-21
lines changed

4 files changed

+92
-21
lines changed

‎WORKSPACE.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@ defaultArgs:
1313
codeWebExtensionCommit: 7ff72a2938a7a06cbdf3964590f7e9b7525958f3
1414
xtermCommit: 8f10c5febf0162a3c2309076302f770fbad38fde
1515
noVerifyJBPlugin: false
16-
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.tar.gz"
17-
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.1.4.tar.gz"
18-
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.1.4.tar.gz"
19-
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.1.4.tar.gz"
20-
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.1.4.tar.gz"
21-
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.1.5.tar.gz"
16+
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2024.2.1.tar.gz"
17+
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2024.2.1.tar.gz"
18+
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2024.2.1.tar.gz"
19+
phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2024.2.1.tar.gz"
20+
rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2024.2.1.tar.gz"
21+
webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2024.2.1.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.1.4.tar.gz"
24-
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.1.6.tar.gz"
23+
# riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2024.2.3.tar.gz"
24+
clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2024.2.1.tar.gz"
25+
rustroverDownloadUrl: "https://download.jetbrains.com/rustrover/RustRover-2024.2.tar.gz"
2526
jbBackendVersion: "latest"
2627
dockerVersion: "20.10.24"
2728
dockerComposeVersion: "2.27.0-gitpod.0"

‎components/ide/jetbrains/backend-plugin/BUILD.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ packages:
7171
- components/gitpod-protocol/java:lib
7272
srcs:
7373
- "**/*.kt"
74-
- "build.gradle-stable.kts"
74+
- "build.gradle.kts"
7575
- "gradle.properties"
7676
- "gradle-stable.properties"
7777
- "gradle/wrapper/*"
@@ -83,10 +83,17 @@ packages:
8383
env:
8484
- JB_QUALIFIER=stable
8585
- NO_VERIFY_JB_PLUGIN=${noVerifyJBPlugin}
86+
# TODO(hw): remove me after java 21 is default version in dev image
87+
- SDKMAN_DIR=/home/gitpod/.sdkman
8688
config:
8789
commands:
88-
- ["mv", "build.gradle-stable.kts", "build.gradle.kts"]
89-
- ["./build.sh", "${__git_commit}"]
90+
- - "bash"
91+
- "-c"
92+
- >
93+
echo java=21.0.3.fx-zulu > .sdkmanrc
94+
&& source "$SDKMAN_DIR/bin/sdkman-init.sh"
95+
&& sdk env install
96+
&& ./build.sh ${__git_commit}
9097
- name: plugin-latest
9198
type: generic
9299
argdeps:
@@ -96,7 +103,7 @@ packages:
96103
- components/gitpod-protocol/java:lib
97104
srcs:
98105
- "**/*.kt"
99-
- "build.gradle-latest.kts"
106+
- "build.gradle.kts"
100107
- "gradle.properties"
101108
- "gradle-latest.properties"
102109
- "gradle/wrapper/*"
@@ -108,12 +115,10 @@ packages:
108115
env:
109116
- JB_QUALIFIER=latest
110117
- NO_VERIFY_JB_PLUGIN=${noVerifyJBPlugin}
111-
# TODO(hw): remove after `2024.2.*` is stable
118+
# TODO(hw): remove me after java 21 is default version in dev image
112119
- SDKMAN_DIR=/home/gitpod/.sdkman
113120
config:
114121
commands:
115-
# TODO(hw): remove after 2024.2.* is stable
116-
- ["mv", "build.gradle-latest.kts", "build.gradle.kts"]
117122
- - "bash"
118123
- "-c"
119124
- >

‎components/ide/jetbrains/backend-plugin/gradle-stable.properties

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# this file is auto generated by components/ide/gha-update-image/index-jb.ts
22
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
33
# for insight into build numbers and IntelliJ Platform versions.
4-
pluginSinceBuild=241.17890
5-
pluginUntilBuild=241.*
4+
# revert pluginSinceBuild if it's unnecessary
5+
pluginSinceBuild=242.19533
6+
pluginUntilBuild=242.*
67
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
78
# See https://jb.gg/intellij-platform-builds-list for available build versions.
8-
pluginVerifierIdeVersions=2024.1
9+
pluginVerifierIdeVersions=2024.2
910
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
10-
platformVersion=241.17890-EAP-CANDIDATE-SNAPSHOT
11+
platformVersion=242.21829-EAP-CANDIDATE-SNAPSHOT

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

Lines changed: 66 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": "{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
157+
"pluginImage": "{{.JetBrainsPluginImage}}",
158158
"pluginLatestImage": "{{.JetBrainsPluginLatestImage}}",
159159
"imageLayers": [
160-
"{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
160+
"{{.JetBrainsPluginImage}}",
161161
"{{.JetBrainsLauncherImage}}"
162162
],
163163
"latestImageLayers": [
@@ -166,6 +166,14 @@
166166
],
167167
"allowPin": true,
168168
"versions": [
169+
{
170+
"version": "2024.2",
171+
"image": "{{.Repository}}/ide/intellij:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
172+
"imageLayers": [
173+
"{{.Repository}}/ide/jb-backend-plugin:commit-2d67254d5aa110bc2c76cd807b85b272e3d54d97-latest",
174+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
175+
]
176+
},
169177
{
170178
"version": "2024.1.4",
171179
"image": "{{.Repository}}/ide/intellij:commit-80f3b3e47fc065d521be745b5795841d5e883667",
@@ -235,6 +243,14 @@
235243
],
236244
"allowPin": true,
237245
"versions": [
246+
{
247+
"version": "2024.1.4",
248+
"image": "{{.Repository}}/ide/goland:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
249+
"imageLayers": [
250+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
251+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
252+
]
253+
},
238254
{
239255
"version": "2024.1.3",
240256
"image": "{{.Repository}}/ide/goland:commit-294b37ad7b93bcc347bf970a11e269e2b477f603",
@@ -297,6 +313,14 @@
297313
],
298314
"allowPin": true,
299315
"versions": [
316+
{
317+
"version": "2024.1.4",
318+
"image": "{{.Repository}}/ide/pycharm:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
319+
"imageLayers": [
320+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
321+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
322+
]
323+
},
300324
{
301325
"version": "2024.1.3",
302326
"image": "{{.Repository}}/ide/pycharm:commit-c295f8299fd17f99913512ec5db5d8a60a1e5d98",
@@ -358,6 +382,14 @@
358382
],
359383
"allowPin": true,
360384
"versions": [
385+
{
386+
"version": "2024.1.4",
387+
"image": "{{.Repository}}/ide/phpstorm:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
388+
"imageLayers": [
389+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
390+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
391+
]
392+
},
361393
{
362394
"version": "2024.1.3",
363395
"image": "{{.Repository}}/ide/phpstorm:commit-c295f8299fd17f99913512ec5db5d8a60a1e5d98",
@@ -419,6 +451,14 @@
419451
],
420452
"allowPin": true,
421453
"versions": [
454+
{
455+
"version": "2024.1.4",
456+
"image": "{{.Repository}}/ide/rubymine:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
457+
"imageLayers": [
458+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
459+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
460+
]
461+
},
422462
{
423463
"version": "2024.1.3",
424464
"image": "{{.Repository}}/ide/rubymine:commit-c295f8299fd17f99913512ec5db5d8a60a1e5d98",
@@ -480,6 +520,14 @@
480520
],
481521
"allowPin": true,
482522
"versions": [
523+
{
524+
"version": "2024.1.5",
525+
"image": "{{.Repository}}/ide/webstorm:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
526+
"imageLayers": [
527+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
528+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
529+
]
530+
},
483531
{
484532
"version": "2024.1.4",
485533
"image": "{{.Repository}}/ide/webstorm:commit-294b37ad7b93bcc347bf970a11e269e2b477f603",
@@ -602,6 +650,14 @@
602650
],
603651
"allowPin": true,
604652
"versions": [
653+
{
654+
"version": "2024.1.4",
655+
"image": "{{.Repository}}/ide/clion:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
656+
"imageLayers": [
657+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
658+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
659+
]
660+
},
605661
{
606662
"version": "2024.1.3",
607663
"image": "{{.Repository}}/ide/clion:commit-294b37ad7b93bcc347bf970a11e269e2b477f603",
@@ -655,6 +711,14 @@
655711
],
656712
"allowPin": true,
657713
"versions": [
714+
{
715+
"version": "2024.1.6",
716+
"image": "{{.Repository}}/ide/rustrover:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7",
717+
"imageLayers": [
718+
"{{.Repository}}/ide/jb-backend-plugin:commit-53299137d92bee639e9f0897bfa5491b947fbbd5",
719+
"{{.Repository}}/ide/jb-launcher:commit-f3193519fdae872d64a2a708f5338eeaabb3b6b7"
720+
]
721+
},
658722
{
659723
"version": "2024.1.5",
660724
"image": "{{.Repository}}/ide/rustrover:commit-519b67858f8be8fc52a3a836b334400e4363c0c6",

0 commit comments

Comments
 (0)