Merge branch 'main' into fix-shebang-partition-3725

Author: philwalk

.github/workflows/ci.yml

@@ -1673,13 +1673,18 @@ jobs:
       run: .github/scripts/gpg-setup.sh
       env:
         PGP_SECRET: ${{ secrets.PGP_SECRET }}
-    - run: ./mill -i ci.setShouldPublish
-    - run: ./mill -i publishSonatype --tasks '{__[],_,test-runner[2.13.16],test-runner[2.12.20],runner[2.13.16],runner[2.12.20]}.publishArtifacts'
+    - name: Set publish flag
+      run: ./mill -i ci.setShouldPublish
+    - name: Print version
+      run: ./mill -i show project.publish.finalPublishVersion
+    - name: Publish to Sonatype Central
+      run: ./mill mill.scalalib.SonatypeCentralPublishModule/ --publishArtifacts '{__[],_,test-runner[2.13.16],test-runner[2.12.20],runner[2.13.16],runner[2.12.20]}.publishArtifacts'
       if: env.SHOULD_PUBLISH == 'true'
       env:
-        PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
-        SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-        SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+        MILL_PGP_SECRET_BASE64: ${{ secrets.PGP_SECRET }}
+        MILL_PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+        MILL_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        MILL_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
     - uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd
       with:
         ssh-private-key: |

build.mill.scala

@@ -72,6 +72,8 @@ object cliBootstrapped extends ScalaCliPublishModule {
 
   import mill.scalalib.Assembly
 
+  override def prependShellScript: T[String] = Task("")
+
   override def mainClass: Target[Option[String]] = Some("scala.cli.ScalaCli")
 
   override def assemblyRules: Seq[Assembly.Rule] = Seq(
@@ -1344,6 +1346,11 @@ object `local-repo` extends LocalRepo {
 
 // Helper CI commands
 def publishSonatype(tasks: mill.main.Tasks[PublishModule.PublishData]) = Task.Command {
+  val taskNames = tasks.value.map(_.toString())
+  System.err.println(
+    s"""Tasks producing artifacts to be included in the bundle:
+       |  ${taskNames.mkString("\n  ")}""".stripMargin
+  )
   val pv = finalPublishVersion()
   System.err.println(s"Publish version: $pv")
   val bundleName = s"$organization-$ghName-$pv"