Skip to content

Commit c286f04

Browse files
authored
Add ChrisCarini/github-pull-request-reminder to 'sync repo secrets'; Add concurrency groups to jetbrains-compatibility.yml; IntelliJ 2025.3 - Unified Distribution support (#576)
* Add `ChrisCarini/github-pull-request-reminder` to 'sync repo secrets' * Add concurrency groups to `jetbrains-compatibility.yml` * IntelliJ 2025.3 - Unified Distribution support
1 parent bb0e2fd commit c286f04

File tree

4 files changed

+15
-44
lines changed

4 files changed

+15
-44
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129

130130
# Store built plugin as an artifact for downloading
131131
- name: Upload artifacts
132-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
132+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
133133
with:
134134
name: "${{ steps.properties.outputs.name }} - ${{ steps.properties.outputs.version }}"
135135
path: ./build/distributions/*

.github/workflows/compatibility.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ on:
1212
schedule:
1313
- cron: '0 0 * * *'
1414

15+
# The concurrency group is configured to run the workflow on the latest iteration of a PR
16+
# (and cancel workflows for older iterations).
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.head_ref }}-${{ github.base_ref }}
19+
cancel-in-progress: true
20+
1521
jobs:
1622
files-changed:
1723
uses: ./.github/workflows/files-changed.yaml

.github/workflows/scorecards-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6161
# format to the repository Actions tab.
6262
- name: "Upload artifact"
63-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
63+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6464
with:
6565
name: SARIF file
6666
path: results.sarif

buildSrc/src/main/kotlin/build-standard-jetbrains-plugin-build.gradle.kts

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ fun extra(key: String): String = project.ext.get(key) as String
1515
val javaVersion = properties("javaVersion")
1616
val platformBundledPlugins = providers.gradleProperty("platformBundledPlugins")
1717
val platformPlugins = providers.gradleProperty("platformPlugins")
18-
val platformType = properties("platformType")
1918
val platformVersion = properties("platformVersion")
2019
val pluginGroup = properties("pluginGroup")
2120
val pluginName = properties("pluginName")
@@ -60,12 +59,7 @@ dependencies {
6059
intellijPlatform {
6160
val isSnapshot = platformVersion.endsWith("-SNAPSHOT")
6261
create(
63-
// Specify both `platformType` and `platformVersion` to correctly "distinguish between IntelliJ IDEA and
64-
// IntelliJ IDEA Ultimate when parsing IU code". This can likely be removed after all plugins updated to
65-
// 2025.3.* RELEASE. See below commit & method impl for details:
66-
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/commit/79f8625f6411ca9cacb3b7db32cbcde7a159e1ad
67-
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/blob/4abe312ff252b9f013451d82844ef4cc9dcc0807/src/main/kotlin/org/jetbrains/intellij/platform/gradle/IntelliJPlatformType.kt#L151-L197
68-
type = IntelliJPlatformType.fromCode(platformType, platformVersion),
62+
type = IntelliJPlatformType.IntellijIdea,
6963
version = platformVersion,
7064
) {
7165
// `useInstaller` needs to be set to 'false' (aka, `isSnapshot` = 'true') to resolve EAP releases.
@@ -224,14 +218,9 @@ intellijPlatform {
224218
logger.debug("Using ${failureLevels.size} Failure Levels: $failureLevels")
225219
failureLevel.set(failureLevels)
226220
ides {
227-
logger.lifecycle("Verifying against IntelliJ Platform $platformType $platformVersion")
221+
logger.lifecycle("Verifying against IntelliJ $platformVersion")
228222
create(
229-
// Specify both `platformType` and `platformVersion` to correctly "distinguish between IntelliJ IDEA and
230-
// IntelliJ IDEA Ultimate when parsing IU code". This can likely be removed after all plugins updated to
231-
// 2025.3.* RELEASE. See below commit & method impl for details:
232-
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/commit/79f8625f6411ca9cacb3b7db32cbcde7a159e1ad
233-
// - https://github.com/JetBrains/intellij-platform-gradle-plugin/blob/4abe312ff252b9f013451d82844ef4cc9dcc0807/src/main/kotlin/org/jetbrains/intellij/platform/gradle/IntelliJPlatformType.kt#L151-L197
234-
type = IntelliJPlatformType.fromCode(platformType, platformVersion),
223+
type = IntelliJPlatformType.IntellijIdea,
235224
version = platformVersion,
236225
) {
237226
useCache = true
@@ -255,10 +244,7 @@ tasks {
255244
}
256245

257246
printProductsReleases {
258-
// // In addition to `IC` (from `platformType`), we also want to verify against `IU`.
259-
// types.set(Arrays.asList(platformType, "IU"))
260-
// Contrary to above, we want to speed up CI, so skip verification of `IU`.
261-
types = listOf(IntelliJPlatformType.fromCode(platformType))
247+
types = listOf(IntelliJPlatformType.IntellijIdea)
262248

263249
// Only get the released versions if we are not targeting an EAP.
264250
val isEAP = pluginVersion.uppercase().endsWith("-EAP")
@@ -280,30 +266,13 @@ tasks {
280266
}
281267
}
282268

283-
// In "IntelliJ Platform Gradle Plugin 2.*", the `listProductsReleases` task no longer exists, but
284-
// instead the `printProductReleases` task does. This task is necessary to take the output of
285-
// `printProductReleases` and write it to a file for use in the `generateIdeVersionsList` task below.
286-
val listProductReleasesTaskName = "listProductsReleases"
287-
register(listProductReleasesTaskName) {
288-
dependsOn(printProductsReleases)
289-
val outputF = layout.buildDirectory.file("listProductsReleases.txt").also {
290-
outputs.file(it)
291-
}
292-
val content = printProductsReleases.flatMap { it.productsReleases }.map { it.joinToString("\n") }
293-
294-
doLast {
295-
outputF.orNull?.asFile?.writeText(content.get())
296-
}
297-
}
298-
299269
// Task to generate the necessary format for `ChrisCarini/intellij-platform-plugin-verifier-action` GitHub Action.
300270
register<DefaultTask>("generateIdeVersionsList") {
301-
dependsOn(project.tasks.named(listProductReleasesTaskName))
302271
doLast {
303272
val ideVersionsList = mutableListOf<String>()
304273

305-
// Include the versions produced from the `listProductsReleases` task.
306-
project.tasks.named(listProductReleasesTaskName).get().outputs.files.singleFile.forEachLine { line ->
274+
// Include the versions produced from the `printProductsReleases` task.
275+
printProductsReleases.flatMap { it.productsReleases }.map { it.joinToString("\n") }.get().split("\n").forEach { line ->
307276
ideVersionsList.add("idea" + line.replace("-", ":"))
308277
}
309278

@@ -315,11 +284,7 @@ tasks {
315284
return@forEach
316285
}
317286

318-
// Note: Used to test against both IC & IU, but now defaulting to just whatever is specified
319-
// by `platformType` in the `gradle.properties` file.
320-
listOf(platformType).forEach { type ->
321-
ideVersionsList.add("idea$type:$version")
322-
}
287+
ideVersionsList.add("ideaIU:$version")
323288
}
324289

325290
// Write out file with unique pairs of type + version

0 commit comments

Comments
 (0)