Skip to content

Specify both platformType and platformVersion to correctly "distinguish between IntelliJ IDEA and IntelliJ IDEA Ultimate when parsing IU code"; set concurrency group for build.yaml GHA workflow.; Use single-string notation instead of group: String, name: String, version: String for junit #529

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.

Sign up for GitHub

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

Merged
ChrisCarini merged 2 commits into from
Oct 3, 2025
Merged

Specify both platformType and platformVersion to correctly "distinguish between IntelliJ IDEA and IntelliJ IDEA Ultimate when parsing IU code"; set concurrency group for build.yaml GHA workflow.; Use single-string notation instead of group: String, name: String, version: String for junit #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
956848d
Specify both `platformType` and `platformVersion` to correctly "disti…
ChrisCarini Oct 3, 2025
957bcf7
Use single-string notation instead of `group: String, name: String, v…
ChrisCarini Oct 3, 2025
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
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ on:
# Trigger the workflow on any pull request
pull_request:

# The concurrency group is configured to run the workflow on the latest iteration of a PR
# (and cancel workflows for older iterations).
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref }}-${{ github.base_ref }}
cancel-in-progress: true

jobs:
files-changed:
uses: ./.github/workflows/files-changed.yaml
Expand Down
19 changes: 16 additions & 3 deletions buildSrc/src/main/kotlin/build-standard-jetbrains-plugin-build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ dependencies {
intellijPlatform {
val isSnapshot = platformVersion.endsWith("-SNAPSHOT")
create(
type = IntelliJPlatformType.fromCode(platformType),
// Specify both `platformType` and `platformVersion` to correctly "distinguish between IntelliJ IDEA and
// IntelliJ IDEA Ultimate when parsing IU code". This can likely be removed after all plugins updated to
// 2025.3.* RELEASE. See below commit & method impl for details:
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/commit/79f8625f6411ca9cacb3b7db32cbcde7a159e1ad
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/blob/4abe312ff252b9f013451d82844ef4cc9dcc0807/src/main/kotlin/org/jetbrains/intellij/platform/gradle/IntelliJPlatformType.kt#L151-L197
type = IntelliJPlatformType.fromCode(platformType, platformVersion),
version = platformVersion,
) {
// `useInstaller` needs to be set to 'false' (aka, `isSnapshot` = 'true') to resolve EAP releases.
Expand All @@ -83,7 +88,7 @@ dependencies {
testFramework(TestFrameworkType.Platform)
}

testImplementation(group = "junit", name = "junit", version = "4.13.2")
testImplementation("junit:junit:4.13.2")
testImplementation("org.testng:testng:7.10.2")
testImplementation("org.mockito:mockito-core:5.12.0")
}
Expand Down Expand Up @@ -220,7 +225,15 @@ intellijPlatform {
failureLevel.set(failureLevels)
ides {
logger.lifecycle("Verifying against IntelliJ Platform $platformType $platformVersion")
create(IntelliJPlatformType.fromCode(platformType), platformVersion) {
create(
// Specify both `platformType` and `platformVersion` to correctly "distinguish between IntelliJ IDEA and
// IntelliJ IDEA Ultimate when parsing IU code". This can likely be removed after all plugins updated to
// 2025.3.* RELEASE. See below commit & method impl for details:
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/commit/79f8625f6411ca9cacb3b7db32cbcde7a159e1ad
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/blob/4abe312ff252b9f013451d82844ef4cc9dcc0807/src/main/kotlin/org/jetbrains/intellij/platform/gradle/IntelliJPlatformType.kt#L151-L197
type = IntelliJPlatformType.fromCode(platformType, platformVersion),
version = platformVersion,
) {
useCache = true
}

Expand Down
Loading