Skip to content

Commit 2d67254

Browse files
mustard-mhroboquat
andauthored
[JetBrains] bump up latest backend plugin platform version and fix integration tests (#20109)
* Update Platform Version of JetBrains Backend Plugin (EAP) to * Revert unnecessary changes * Fix project name and build target name * Fix integration tests --------- Co-authored-by: Robo Quat <[email protected]>
1 parent f5acd61 commit 2d67254

File tree

11 files changed

+23
-8
lines changed

11 files changed

+23
-8
lines changed

components/ide/jetbrains/backend-plugin/build.gradle-latest.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ dependencies {
9696
// Read more: https://github.com/JetBrains/gradle-intellij-plugin
9797
intellijPlatform {
9898
pluginConfiguration {
99-
name = properties("pluginName")
99+
name = properties("latestPluginName")
100100
version = pluginVersion
101101
ideaVersion {
102102
sinceBuild = properties("pluginSinceBuild")

components/ide/jetbrains/backend-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ dependencies {
9696
// Read more: https://github.com/JetBrains/gradle-intellij-plugin
9797
intellijPlatform {
9898
pluginConfiguration {
99-
name = properties("pluginName")
99+
name = properties("latestPluginName")
100100
version = pluginVersion
101101
ideaVersion {
102102
sinceBuild = properties("pluginSinceBuild")
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Code generated by gha-update-image/index-jb-platform-update.ts. DO NOT EDIT.
12
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
23
# for insight into build numbers and IntelliJ Platform versions.
34
pluginSinceBuild=242.19533
@@ -6,4 +7,4 @@ pluginUntilBuild=242.*
67
# See https://jb.gg/intellij-platform-builds-list for available build versions.
78
pluginVerifierIdeVersions=2024.2
89
# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
9-
platformVersion=242.20224-EAP-CANDIDATE-SNAPSHOT
10+
platformVersion=242.20224.300

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ environmentName=latest
66
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
77
pluginGroup=io.gitpod.jetbrains
88
pluginName=gitpod-remote
9+
# TODO(hw): replace pluginName after 2024.2 is stable
10+
latestPluginName=Gitpod Remote
911
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
1012
platformType=IU
1113
platformDownloadSources=true

components/ide/jetbrains/gateway-plugin/build.gradle-latest.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ dependencies {
8282
// Configure gradle-intellij-plugin plugin.
8383
intellijPlatform {
8484
pluginConfiguration {
85-
name = properties("pluginName")
85+
id = properties("pluginId")
86+
name = properties("latestPluginName")
8687
version = pluginVersion
8788

8889
description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {

components/ide/jetbrains/gateway-plugin/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ dependencies {
8282
// Configure gradle-intellij-plugin plugin.
8383
intellijPlatform {
8484
pluginConfiguration {
85-
name = properties("pluginName")
85+
id = properties("pluginId")
86+
name = properties("latestPluginName")
8687
version = pluginVersion
8788

8889
description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {

components/ide/jetbrains/gateway-plugin/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ environmentName=latest
44
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
55
pluginGroup=io.gitpod.jetbrains
66
pluginName=gitpod-gateway
7+
# TODO(hw): replace pluginName after 2024.2 is stable
8+
latestPluginName=Gitpod Gateway
9+
pluginId=io.gitpod.jetbrains.gateway
710
# It is overriden by CI during the build.
811
pluginVersion=0.0.1
912
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type

dev/jetbrains-test/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
build
44
bin
55
gitpod-gateway.zip
6+
jetbrains-gateway-gitpod-plugin.zip
67
video

dev/jetbrains-test/BUILD.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ scripts:
66
- components/ide/jetbrains/gateway-plugin:publish-stable
77
workdir: origin
88
script: |
9+
# TODO(hw): replace source gitpod-gateway.zip with jetbrains-gateway-gitpod-plugin.zip after 2024.2 is stable
910
cp $COMPONENTS_IDE_JETBRAINS_GATEWAY_PLUGIN__PUBLISH_STABLE/build/distributions/gitpod-gateway.zip gitpod-gateway.zip
1011
./test.sh
1112
- name: test-latest
@@ -15,7 +16,7 @@ scripts:
1516
- components/ide/jetbrains/gateway-plugin:publish-latest
1617
workdir: origin
1718
script: |
18-
cp $COMPONENTS_IDE_JETBRAINS_GATEWAY_PLUGIN__PUBLISH_LATEST/build/distributions/gitpod-gateway.zip gitpod-gateway.zip
19+
cp $COMPONENTS_IDE_JETBRAINS_GATEWAY_PLUGIN__PUBLISH_LATEST/build/distributions/jetbrains-gateway-gitpod-plugin.zip gitpod-gateway.zip
1920
./test.sh
2021
- name: install-gui-dependencies
2122
script: |

dev/jetbrains-test/test.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ GATEWAY_PLUGIN_PATH=$(pwd)/gitpod-gateway.zip
44
export GATEWAY_PLUGIN_PATH
55
HOME=/home/gitpod
66

7+
if [ ! -f "$GATEWAY_PLUGIN_PATH" ]; then
8+
echo "Gateway plugin zip not found at $GATEWAY_PLUGIN_PATH"
9+
exit 1
10+
fi
11+
712
mkdir -p $HOME/.local/share/JetBrains/consentOptions/
813
echo -n "rsch.send.usage.stat:1.1:0:1644945193441" > $HOME/.local/share/JetBrains/consentOptions/accepted
914
mkdir -p $HOME/.config/JetBrains/JetBrainsClient/options

0 commit comments

Comments
 (0)