Merge pull request #1962 from scalacenter/sbt-ci-release

refactor(ci): migrate to sbt-ci-release

Author: ckipp01

.github/workflows/ci.yml

@@ -248,12 +248,10 @@ jobs:
     env:
       CI: true
       SKIP_TEST_RESOURCES_GENERATION: true
-      SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
+      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
       SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-      PGP_PASSWORD: ${{ secrets.PGP_PASSWORD }}
-      PGP_PASSPHRASE: ${{ secrets.PGP_PASSWORD }}
-      PGP_PUBLIC_KEY: ${{ secrets.PGP_PUBLIC_KEY }}
-      PGP_PRIVATE_KEY: ${{ secrets.PGP_PRIVATE_KEY }}
+      PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+      PGP_SECRET: ${{ secrets.PGP_SECRET }}
       GITHUB_DEPLOY_KEY: ${{ secrets.GITHUB_DEPLOY_KEY }}
       BLOOPOID_GITHUB_TOKEN: ${{ secrets.BLOOPOID_GITHUB_TOKEN }}
       BLOOPOID_SSH_PUBLIC_KEY: ${{ secrets.BLOOPOID_SSH_PUBLIC_KEY }}
@@ -283,18 +281,13 @@ jobs:
         run: |
           yarn install
           touch ~/.profile
-          mkdir "$HOME/.ssh"
-          mkdir "$HOME/.sbt"
-          mkdir "$HOME/.sbt/gpg"
           git config --global user.name "Bloopoid"
           git config --global user.email "bloop@vican.me"
           git config --global push.default simple
-          echo "$PGP_PUBLIC_KEY" > "$HOME/.sbt/gpg/pubring.asc"
-          echo "$PGP_PRIVATE_KEY" > "$HOME/.sbt/gpg/secring.asc"
           ls -l bloop-artifacts
           mkdir -p frontend/target
           mv bloop-artifacts frontend/target/graalvm-binaries
-          ./bin/sbt-ci-publish.sh "releaseBloop" "docs/docusaurusPublishGhpages"
+          ./bin/sbt-ci-publish.sh "ci-release" "docs/docusaurusPublishGhpages"
         shell: bash
       - name: Cut GitHub release and update installers on ${{ matrix.os }}
         run: |

bin/set-up-keys.sh

@@ -2,9 +2,6 @@ import build.BuildImplementation.BuildDefaults
 import build.BuildImplementation.jvmOptions
 import build.Dependencies
 import build.Dependencies.{Scala211Version, Scala212Version, SbtVersion}
-import xerial.sbt.Sonatype.SonatypeKeys
-
-Global / useGpg := false
 
 ThisBuild / dynverSeparator := "-"
 
@@ -51,9 +48,8 @@ val benchmarkBridge = project
   .in(file(".benchmark-bridge-compilation"))
   .aggregate(BenchmarkBridgeCompilation)
   .disablePlugins(ScriptedPlugin)
-  .settings(scalafixSettings)
   .settings(
-    releaseEarly := { () },
+    scalafixSettings,
     (publish / skip) := true
   )
 
@@ -172,9 +168,9 @@ lazy val frontend: Project = project
     ),
     dependencyOverrides += Dependencies.shapeless,
     scalafixSettings,
-    releaseSettings,
     testSettings,
     testSuiteSettings,
+    releaseSettings,
     Defaults.itSettings,
     BuildDefaults.frontendTestBuildSettings,
     inConfig(Compile)(
@@ -290,6 +286,7 @@ lazy val launcherTest = project
   .dependsOn(launcher, frontend % "test->test")
   .settings(
     name := "bloop-launcher-test",
+    (publish / skip) := true,
     scalafixSettings,
     testSuiteSettings,
     (Test / fork) := true,
@@ -453,37 +450,22 @@ lazy val twitterIntegrationProjects = project
   )
 
 val allProjects = Seq(
-  bloopShared,
   backend,
-  frontend,
   benchmarks,
-  sbtBloop,
-  nativeBridge04,
-  jsBridge06,
-  jsBridge1,
-  launcher,
-  launcher213,
-  launcherTest,
-  sockets,
   bloopgun,
-  bloopgun213
-)
-
-val allProjectsToRelease = Seq[ProjectReference](
+  bloopgun213,
   bloopShared,
-  backend,
+  buildpress,
+  buildpressConfig,
   frontend,
-  sbtBloop,
-  nativeBridge04,
   jsBridge06,
   jsBridge1,
-  sockets,
-  bloopgun,
-  bloopgun213,
   launcher,
   launcher213,
-  buildpressConfig,
-  buildpress
+  launcherTest,
+  nativeBridge04,
+  sbtBloop,
+  sockets
 )
 
 val allProjectReferences = allProjects.map(p => LocalProject(p.id))
@@ -492,26 +474,7 @@ val bloop = project
   .disablePlugins(ScriptedPlugin)
   .aggregate(allProjectReferences: _*)
   .settings(
-    releaseEarly := { () },
     (publish / skip) := true,
-    publishLocalAllModules := {
-      BuildDefaults
-        .publishLocalAllModules(allProjectsToRelease)
-        .value
-    },
-    releaseEarlyAllModules := {
-      BuildDefaults
-        .releaseEarlyAllModules(allProjectsToRelease)
-        .value
-    },
-    releaseSonatypeBundle := {
-      Def.taskDyn {
-        val bundleDir = SonatypeKeys.sonatypeBundleDirectory.value
-        // Do nothing if sonatype bundle doesn't exist
-        if (!bundleDir.exists) Def.task("")
-        else SonatypeKeys.sonatypeBundleRelease
-      }.value
-    },
     exportCommunityBuild := {
       build.BuildImplementation
         .exportCommunityBuild(
@@ -528,7 +491,7 @@ val isWindows = scala.util.Properties.isWin
 addCommandAlias(
   "install",
   Seq(
-    "publishLocalAllModules",
+    "publishLocal",
     // Don't generate graalvm image if running in Windows
     if (isWindows) "" else "bloopgun/graalvm-native-image:packageBin",
     s"${frontend.id}/test:compile",
@@ -538,6 +501,3 @@ addCommandAlias(
   ).filter(!_.isEmpty)
     .mkString(";", ";", "")
 )
-
-val allReleaseActions = List("releaseEarlyAllModules", "sonatypeBundleRelease")
-addCommandAlias("releaseBloop", allReleaseActions.mkString(";", ";", ""))

build.sbt

@@ -2,29 +2,27 @@ package build
 
 import java.io.File
 
-import ch.epfl.scala.sbt.release.Feedback
 import com.jsuereth.sbtpgp.SbtPgp.{autoImport => Pgp}
 import sbt._
 import sbt.io.IO
 import sbt.io.syntax.fileToRichFile
 import sbt.librarymanagement.syntax.stringToOrganization
 import sbt.util.FileFunction
 import sbtdynver.GitDescribeOutput
-import ch.epfl.scala.sbt.release.ReleaseEarlyPlugin.{autoImport => ReleaseEarlyKeys}
 import sbt.internal.BuildLoader
 import sbt.librarymanagement.MavenRepository
 import sbt.util.Logger
 import sbtbuildinfo.BuildInfoPlugin.{autoImport => BuildInfoKeys}
+import com.geirsson.CiReleasePlugin
 
 object BuildPlugin extends AutoPlugin {
   import sbt.plugins.JvmPlugin
   import sbt.plugins.IvyPlugin
   import com.jsuereth.sbtpgp.SbtPgp
-  import ch.epfl.scala.sbt.release.ReleaseEarlyPlugin
 
   override def trigger: PluginTrigger = allRequirements
   override def requires: Plugins =
-    JvmPlugin && ReleaseEarlyPlugin && SbtPgp && IvyPlugin
+    JvmPlugin && CiReleasePlugin && IvyPlugin
   val autoImport = BuildKeys
 
   override def globalSettings: Seq[Def.Setting[_]] =
@@ -81,9 +79,6 @@ object BuildKeys {
   val createLocalArchPackage = Def.taskKey[Unit]("Create local ArchLinux package build files")
   val bloopCoursierJson = Def.taskKey[File]("Generate a versioned install script")
   val bloopLocalCoursierJson = Def.taskKey[File]("Generate a versioned install script")
-  val releaseEarlyAllModules = Def.taskKey[Unit]("Release early all modules")
-  val releaseSonatypeBundle = Def.taskKey[Unit]("Release sonatype bundle, do nothing if no release")
-  val publishLocalAllModules = Def.taskKey[Unit]("Publish all modules locally")
 
   // This has to be change every time the bloop config files format changes.
   val schemaVersion = Def.settingKey[String]("The schema version for our bloop build.")
@@ -171,9 +166,7 @@ object BuildKeys {
     Keys.name := name,
     Keys.sbtPlugin := true,
     Keys.sbtVersion := sbtVersion,
-    Keys.target := (file("integrations") / "sbt-bloop" / "target" / sbtVersion).getAbsoluteFile,
-    Keys.publishMavenStyle :=
-      ReleaseEarlyKeys.releaseEarlyWith.value == ReleaseEarlyKeys.SonatypePublisher
+    Keys.target := (file("integrations") / "sbt-bloop" / "target" / sbtVersion).getAbsoluteFile
   )
 
   def benchmarksSettings(dep: Reference): Seq[Def.Setting[_]] = List(
@@ -240,9 +233,6 @@ object BuildImplementation {
       val sonatypeStaging = Resolver.sonatypeOssRepos("staging")
       (oldResolvers ++ sonatypeStaging).distinct
     },
-    ReleaseEarlyKeys.releaseEarlyWith := {
-      ReleaseEarlyKeys.SonatypePublisher
-    },
     Keys.startYear := Some(2017),
     Keys.autoAPIMappings := true,
     Keys.publishMavenStyle := true,
@@ -275,7 +265,6 @@ object BuildImplementation {
   )
 
   final val projectSettings: Seq[Def.Setting[_]] = Seq(
-    ReleaseEarlyKeys.releaseEarlyPublish := BuildDefaults.releaseEarlyPublish.value,
     Keys.scalacOptions := {
       CrossVersion.partialVersion(Keys.scalaVersion.value) match {
         case Some((2, 13)) =>
@@ -427,36 +416,6 @@ object BuildImplementation {
       }
     )
 
-    val releaseEarlyPublish: Def.Initialize[Task[Unit]] = Def.task {
-      val logger = Keys.streams.value.log
-      val name = Keys.name.value
-      // We force publishSigned for all of the modules, yes or yes.
-      logger.info(Feedback.logReleaseSonatype(name))
-      Pgp.PgpKeys.publishSigned.value
-    }
-
-    def releaseEarlyAllModules(projects: Seq[sbt.ProjectReference]): Def.Initialize[Task[Unit]] = {
-      Def.taskDyn {
-        val filter = sbt.ScopeFilter(
-          sbt.inProjects(projects: _*),
-          sbt.inConfigurations(sbt.Compile)
-        )
-
-        ReleaseEarlyKeys.releaseEarly.all(filter).map(_ => ())
-      }
-    }
-
-    def publishLocalAllModules(projects: Seq[sbt.ProjectReference]): Def.Initialize[Task[Unit]] = {
-      Def.taskDyn {
-        val filter = sbt.ScopeFilter(
-          sbt.inProjects(projects: _*),
-          sbt.inConfigurations(sbt.Compile)
-        )
-
-        Keys.publishLocal.all(filter).map(_ => ())
-      }
-    }
-
     // From sbt-sensible https://gitlab.com/fommil/sbt-sensible/issues/5, legal requirement
     val getLicense: Def.Initialize[Task[Seq[File]]] = Def.task {
       val orig = (Compile / Keys.resources).value

project/BuildPlugin.scala

@@ -1 +1 @@
-sbt.version=1.7.2
+sbt.version=1.8.0

project/build.properties

@@ -13,10 +13,10 @@ val `bloop-build` = project
     // Bumping this will causes issues. For now just lock it
     addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.7"),
     addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1"),
-    addSbtPlugin("ch.epfl.scala" % "sbt-release-early" % "2.1.1+4-9d76569a"),
+    addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11"),
     addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.6"),
     addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1"),
-    addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1"),
+    addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.11"),
     libraryDependencies ++= List(
       "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r",
       "org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "5.13.1.202206130422-r",