feat: WIP #272 - Add support back for publishing and second phase of …

…fixes
SJrX · Aug 30, 2024 · 3cc1345 · 3cc1345
1 parent 588fde2
commit 3cc1345
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 out/
+/.kotlin
 /.idea
 /.gradle
 /build

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -76,7 +76,7 @@ dependencies {
   testImplementation("org.opentest4j:opentest4j:1.3.0")
 
   intellijPlatform {
-    val type = providers.gradleProperty("platformType")
+    val type = providers.gradleProperty("platformType").orElse("IC")
     val version = providers.gradleProperty("intellijVersion")
 
     create(type, version)
@@ -289,15 +289,14 @@ if (hasProperty("buildScan")) {
 }
 
 
-//tasks.register<org.jetbrains.intellij.tasks.PublishPluginTask>("publishPluginStandalone") {
-//  token.set(System.getenv("PUBLISH_TOKEN"))
-//  // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
-//  // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
-//  // https://jetbrains.org/intellij/sdk/docs/tutorials/build_system/deployment.html#specifying-a-release-channel
-//  channels.set(listOf(System.getenv("RELEASE_CHANNEL")?:"dev"))
-//  host.set("https://plugins.jetbrains.com")
-//  toolboxEnterprise.set(false)
-//
-//  // Set the distribution file in gradle build to the archive file of the buildPlugin task
-//  distributionFile.set(project.file("build/distributions/${project.name}-${project.version}.zip"))
-//}
+tasks.register<org.jetbrains.intellij.platform.gradle.tasks.PublishPluginTask>("publishPluginStandalone") {
+  token.set(System.getenv("PUBLISH_TOKEN"))
+  // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
+  // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
+  // https://jetbrains.org/intellij/sdk/docs/tutorials/build_system/deployment.html#specifying-a-release-channel
+  channels.set(listOf(System.getenv("RELEASE_CHANNEL")?:"dev"))
+  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"))
+}
diff --git a/ci/Build-Environment.Dockerfile b/ci/Build-Environment.Dockerfile
@@ -10,7 +10,7 @@ RUN useradd -m builduser -u 1000
 
 USER 1000
 
-ARG BRANCH=issue-272
+ARG BRANCH=242.x
 
 RUN git clone --depth 1 -b ${BRANCH} https://github.com/SJrX/systemdUnitFilePlugin.git && \
       cd /tmp/systemdUnitFilePlugin && \

diff --git a/ci/release-branch-automation.Jenkinsfile b/ci/release-branch-automation.Jenkinsfile
@@ -85,7 +85,8 @@ pipeline {
 
 
 
-                  echo "#Warning this file is AUTO-generated and overridden" > systemdUnitFilePlugin/gradle.properties
+                  echo "# Warning this file is AUTO-generated and overridden" > systemdUnitFilePlugin/gradle.properties
+                  echo "platformType=IC" >> systemdUnitFilePlugin/gradle.properties
 
                   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

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,5 @@
 #Warning this file is AUTO-generated and overridden
+platformType=IC
 intellijVersion=2024.2
 sinceVersion=242.0
 untilVersion=270.0