From b9759d51d388031afd3c7247b4a577ec5a77f21e Mon Sep 17 00:00:00 2001
From: Maksim Kurnikov <maxim.kurnikov@gmail.com>
Date: Mon, 2 Dec 2024 21:45:55 +0100
Subject: [PATCH] add pc/rr matrix to CI (#258)

---
 .github/workflows/check.yml |  2 ++
 build.gradle.kts            |  7 ++-----
 gradle-242.properties       | 12 +-----------
 gradle-243.properties       | 10 ----------
 gradle.properties           |  5 +++++
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 4219222b..9ce83d23 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -11,10 +11,12 @@ jobs:
         strategy:
             matrix:
                 gradle-properties-version: [ 242, 243 ]
+                platform-type: [ RR, PC ]
 
         runs-on: ubuntu-latest
         env:
             ORG_GRADLE_PROJECT_shortPlatformVersion: ${{ matrix.gradle-properties-version }}
+            ORG_GRADLE_PROJECT_platformType: ${{ matrix.platform-type }}
 
         steps:
             -   uses: actions/checkout@v4
diff --git a/build.gradle.kts b/build.gradle.kts
index 7cc26de0..dbca0ddb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,9 +9,6 @@ import java.util.*
 @Suppress("USELESS_ELVIS_RIGHT_IS_NULL")
 val publishingToken = System.getenv("JB_PUB_TOKEN") ?: null
 
-// set by default in Github Actions
-val isCI = System.getenv("CI") != null
-
 fun prop(name: String): String =
     extra.properties[name] as? String
         ?: error("Property `$name` is not defined in gradle.properties for environment `$shortPlatformVersion`")
@@ -104,8 +101,8 @@ allprojects {
         pluginConfiguration {
             version.set(pluginVersion)
             ideaVersion {
-                sinceBuild.set(prop("pluginSinceBuild"))
-                untilBuild.set(prop("pluginUntilBuild"))
+                sinceBuild.set(shortPlatformVersion)
+                untilBuild.set("$shortPlatformVersion.*")
             }
 
             val codeVersionForUrl = codeVersion.replace('.', '-')
diff --git a/gradle-242.properties b/gradle-242.properties
index e0157637..0ea53643 100644
--- a/gradle-242.properties
+++ b/gradle-242.properties
@@ -1,15 +1,5 @@
-# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 242
-pluginUntilBuild = 242.*
-
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = PC
 platformVersion = 2024.2
 
-# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = org.toml.lang
-
-# should be false when using EAP builds
-useInstaller=false
+useInstaller=true
diff --git a/gradle-243.properties b/gradle-243.properties
index 38aa10e4..cb02c42c 100644
--- a/gradle-243.properties
+++ b/gradle-243.properties
@@ -1,15 +1,5 @@
-# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-# for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 243
-pluginUntilBuild = 243.*
-
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = RR
 platformVersion = 2024.3
 
-# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = org.toml.lang
-
-# should be false when using EAP builds
 useInstaller=true
diff --git a/gradle.properties b/gradle.properties
index f2445812..94309a90 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,9 @@ propertiesPluginEnvironmentNameProperty=shortPlatformVersion
 # pass ORG_GRADLE_PROJECT_shortPlatformVersion environment variable to overwrite
 shortPlatformVersion=242
 
+# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
+# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
+platformPlugins = org.toml.lang
+
+# set to false when using EAP builds
 useInstaller=true