Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add PC/RR matrix to CI #258

Merged
merged 1 commit into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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`")
Expand Down Expand Up @@ -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('.', '-')
Expand Down
12 changes: 1 addition & 11 deletions gradle-242.properties
Original file line number Diff line number Diff line change
@@ -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
10 changes: 0 additions & 10 deletions gradle-243.properties
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading