[publish] update ci actions

.github/workflows/release.yml

@@ -272,7 +272,7 @@ jobs:
       - name: Publish publish stage
         uses: actions/upload-artifact@v3
         with:
-          name: publish-stage-2
+          name: publish-stage-${{ matrix.os }}
           path: ci-release-helper/stage-repo
 
   publish-stage-to-maven-central:
@@ -299,20 +299,13 @@ jobs:
       - name: Download publish stage 1
         uses: actions/download-artifact@v3
         with:
-          name: publish-stage-1
-          path: ci-release-helper/stage-1
+          path: ci-release-helper/stages
 
-      - name: Download publish stage 2
-        uses: actions/download-artifact@v3
-        with:
-          name: publish-stage-1
-          path: ci-release-helper/stage-2
 
       - name: Merge stages
         run: >
           ./gradlew runcihelper --args merge-repos --scan
-          -Pcihelper.repo1=ci-release-helper/stage-1
-          -Pcihelper.repo2=ci-release-helper/stage-2
+          -Pcihelper.repos=ci-release-helper/stages
 
       - name: Publish to maven central
         run: ./gradlew runcihelper --args publish-to-maven-central --scan "-Dcihelper.cert.username=${{ secrets.SONATYPE_USER }}" "-Dcihelper.cert.password=${{ secrets.SONATYPE_KEY }}"

ci-release-helper/build.gradle.kts

@@ -18,6 +18,7 @@ plugins {
 tasks.register<JavaExec>("runcihelper") {
     this.classpath = sourceSets["main"].runtimeClasspath
     this.mainClass.set("cihelper.CiHelperKt")
+    this.workingDir = rootProject.projectDir
 
     fun Project.findPublishingExt(): PublishingExtension? {
         val exts = (this@findPublishingExt as ExtensionAware).extensions

ci-release-helper/src/CiHelper.kt

@@ -74,12 +74,22 @@ fun main(args: Array<String>) {
         }
 
         "merge-repos" -> {
-            val repos = System.getProperties().asSequence()
+            var repos = System.getProperties().asSequence()
                 .filter { it.key.toString().startsWith("cihelper.repo") }
                 .map { it.value.toString() }
                 .map { Paths.get(it) }
                 .toList()
             println(repos)
+            if (repos.size == 1) {
+                val fst = repos.first()
+                if (!fst.resolve("net/mamoe").isDirectory()) {
+                    repos = fst.listDirectoryEntries()
+                        .asSequence()
+                        .filter { it.isDirectory() }
+                        .filter { it.name.startsWith("publish-stage-") }
+                        .toList()
+                }
+            }
 
             repos.forEach { arepo ->
                 Files.walk(arepo)