diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e65302c7..e1547164 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,8 +51,8 @@ jobs: - name: Setup sbt uses: sbt/setup-sbt@v1 - - name: Check that workflows are up to date - run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' githubWorkflowCheck + #- name: Check that workflows are up to date + # run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' githubWorkflowCheck - name: Build project run: sbt -J-Xmx2G '++ ${{ matrix.scala }}' test @@ -137,4 +137,4 @@ jobs: SONATYPE_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }} SONATYPE_USERNAME: ${{ secrets.CENTRAL_DEPLOY_USERNAME }} PGP_SECRET: ${{ secrets.PGP_SECRET }} - run: sbt -J-Xmx2G ci-release + run: sbt -J-Xmx2G +publish diff --git a/build.sbt b/build.sbt index 8855da79..72d66c83 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -import sbtghactions.JavaSpec.Distribution.Zulu +// import sbtghactions.JavaSpec.Distribution.Zulu import com.github.sbt.sbom._ import xerial.sbt.Sonatype.sonatypeCentralHost @@ -123,6 +123,7 @@ Compile / resourceGenerators += Def.task { Test / parallelExecution := false +/* ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G" ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21")) ThisBuild / githubWorkflowTargetBranches := Seq("3.x") @@ -145,6 +146,7 @@ ThisBuild / githubWorkflowPublish := Seq( ) ) ) +*/ enablePlugins(ReproducibleBuildsPlugin) // site diff --git a/project/plugins.sbt b/project/plugins.sbt index 7da88b51..37ca6a51 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,13 +8,13 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.25.0") +// addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.25.0") addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.0") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.0") +// addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.0-RC3") addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.32")