Skip to content
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
7 changes: 4 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ fun getVersionNumber() : String {
val build = System.getenv("BUILD_NUMBER") ?: 3


val branchName = System.getenv("BRANCH_NAME") ?: "undefined"
// Branch names like "fix/foo" would otherwise put a path separator into the distribution zip's file name
val branchName = (System.getenv("BRANCH_NAME") ?: "undefined").replace(Regex("[^A-Za-z0-9._-]"), "-")

if (branchName.matches(Regex("""[0-9]{3}\.x"""))) {
return "${major}.${minor}.${build}"
Expand All @@ -29,7 +30,7 @@ fun getVersionNumber() : String {

plugins {
id("java")
id("org.jetbrains.intellij.platform") version "2.18.1"
id("org.jetbrains.intellij.platform") version "2.19.0"
id("org.jetbrains.grammarkit") version "2023.3.0.4"
id("checkstyle")
id("com.avast.gradle.docker-compose") version "0.17.21"
Expand Down Expand Up @@ -404,5 +405,5 @@ tasks.register<org.jetbrains.intellij.platform.gradle.tasks.PublishPluginTask>("
host.set("https://plugins.jetbrains.com")

// Set the distribution file in gradle build to the archive file of the buildPlugin task
archiveFile.set(project.file("build/distributions/${project.name}-${project.version}.zip"))
archiveFiles.from(project.file("build/distributions/${project.name}-${project.version}.zip"))
}
2 changes: 2 additions & 0 deletions ci/release-branch-automation.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ pipeline {
echo \$BRANCH_NAME | sed -E "s/([0-9][0-9])([0-9]).x/intellijVersion=20\\1.\\2/" >> systemdUnitFilePlugin/gradle.properties
echo \$BRANCH_NAME | sed -E "s/([0-9][0-9])([0-9]).x/sinceVersion=\\1\\2.0/" >> systemdUnitFilePlugin/gradle.properties
echo \$BRANCH_NAME | sed -E "s/([0-9][0-9])([0-9]).x/pluginMajorVersion=\\1\\2/" >> systemdUnitFilePlugin/gradle.properties
echo "kotlin.stdlib.default.dependency=true" >> systemdUnitFilePlugin/gradle.properties
echo "org.jetbrains.intellij.platform.useDefaultSandboxExclusions=false" >> systemdUnitFilePlugin/gradle.properties

git -C systemdUnitFilePlugin add gradle.properties
cat systemdUnitFilePlugin/gradle.properties
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ platformType=IC
intellijVersion=2024.2
sinceVersion=242.0
pluginMajorVersion=242
kotlin.stdlib.default.dependency=true
org.jetbrains.intellij.platform.useDefaultSandboxExclusions=false
Loading