Kotlin nightlies: rebase on top of main (#6010)

Author: BoD

.github/workflows/bump-kotlin-nightlies.yml

@@ -10,20 +10,10 @@ jobs:
     runs-on: macos-14
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
-      - name: Bump Kotlin version
+        with:
+          ref: kotlin-nightlies
+          fetch-depth: 0
+      - name: Rebase on top of main, bump versions, commit and push, and trigger 'pr' workflow
         run: ./scripts/bump-kotlin-nightlies.main.kts
-      - name: Update API dump
-        run: ./gradlew apiDump
-      - name: Commit and push changes to kotlin-nightlies branch
-        run: |
-          git checkout -b kotlin-nightlies
-          git add .
-          git commit -m "Bump Kotlin version"
-          git push --force origin kotlin-nightlies
-      # Trigger a workflow manually because actions cannot trigger workflows to avoid endless loops
-      # https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
-      - name: Trigger pr workflow
-        run: |
-          gh workflow run pr --ref kotlin-nightlies
     env:
       GH_TOKEN: ${{ github.token }}

scripts/bump-kotlin-nightlies.main.kts

@@ -4,10 +4,13 @@ import java.io.File
 import java.net.URL
 import javax.xml.parsers.DocumentBuilderFactory
 
-fun main() {
-  // Update versions in libraries.toml
-  val kotlinVersion = getLatestVersion("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/org/jetbrains/kotlin/kotlin-stdlib/maven-metadata.xml", prefix = "2.0.20")
-  val kspVersion = getLatestVersion("https://oss.sonatype.org/content/repositories/snapshots/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml")
+val BRANCH_NAME = "kotlin-nightlies"
+
+fun bumpVersions() {
+  val kotlinVersion =
+    getLatestVersion("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/org/jetbrains/kotlin/kotlin-stdlib/maven-metadata.xml", prefix = "2.0.20")
+  val kspVersion =
+    getLatestVersion("https://oss.sonatype.org/content/repositories/snapshots/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml")
   File("gradle/libraries.toml").let { file ->
     file.writeText(
         file.readText()
@@ -17,24 +20,6 @@ fun main() {
             .replaceVersion("ksp", kspVersion)
     )
   }
-
-  // Uncomment Kotlin dev maven repository, add Sonatype snapshots repository
-  setOf(
-      File("gradle/repositories.gradle.kts"),
-      File("intellij-plugin/build.gradle.kts"),
-  )
-      .forEach { file ->
-        file.writeText(
-            file.readText()
-                .replace(
-                    """// maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") }""",
-                    """
-                      maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") }
-                      maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
-                    """.trimIndent()
-                )
-        )
-      }
 }
 
 fun String.replaceVersion(key: String, version: String): String {
@@ -66,4 +51,56 @@ fun getLatestVersion(url: String, prefix: String? = null): String {
   }
 }
 
+fun runCommand(vararg args: String): String {
+  val builder = ProcessBuilder(*args)
+      .redirectError(ProcessBuilder.Redirect.INHERIT)
+  val process = builder.start()
+  val output = process.inputStream.bufferedReader().readText().trim()
+  val ret = process.waitFor()
+  if (ret != 0) {
+    throw Exception("command ${args.joinToString(" ")} failed:\n$output")
+  }
+  return output
+}
+
+fun runCommand(args: String): String {
+  return runCommand(*args.split(" ").toTypedArray())
+}
+
+fun rebaseOnTopOfMain() {
+  val firstCommitMessage = "Add Kotlin Dev and Maven Central Snapshots repositories"
+  runCommand("git fetch origin main:main")
+  val baseCommit = runCommand("git", "rev-parse", "HEAD^{/$firstCommitMessage}^")
+  runCommand("git rebase --rebase-merges $baseCommit --onto main")
+}
+
+fun triggerPrWorkflow() {
+  runCommand("gh workflow run pr --ref $BRANCH_NAME")
+}
+
+fun commitAndPush() {
+  val status = runCommand("git status")
+  if (status.contains("nothing to commit")) {
+    println("No changes to commit")
+    return
+  }
+  runCommand("git add .")
+  runCommand("git", "commit", "-m", "Bump Kotlin version")
+  runCommand("git push --force origin $BRANCH_NAME")
+}
+
+fun main() {
+  println("Rebase on top of main")
+  rebaseOnTopOfMain()
+
+  println("Bump versions in libraries.toml")
+  bumpVersions()
+
+  println("Commit and push")
+  commitAndPush()
+
+  println("Trigger 'pr' workflow")
+  triggerPrWorkflow()
+}
+
 main()