Update sbt-typelevel.

tarao · Jun 2, 2024 · ad1f0ac · ad1f0ac
1 parent 2fd0f24
commit ad1f0ac
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 12 deletions.
diff --git a/build.sbt b/build.sbt
@@ -330,15 +330,36 @@ githubWorkflowGenerate := {
 
   val site = {
     val job = githubWorkflowGeneratedCI.value.find(_.id == "site").get
-    job.copy(steps = job.steps.map { step =>
-      if (step.name == Some("Publish site")) {
-        step.withCond(step.cond.map { cond =>
-          s"github.event_name == 'workflow_dispatch' || ( ${cond} )"
-        })
-      } else {
-        step
-      }
-    })
+    WorkflowJob(
+      id   = job.id,
+      name = job.name,
+      steps = job.steps.map { step =>
+        if (step.name == Some("Publish site")) {
+          step.withCond(step.cond.map { cond =>
+            s"github.event_name == 'workflow_dispatch' || ( ${cond} )"
+          })
+        } else {
+          step
+        }
+      },
+      sbtStepPreamble   = job.sbtStepPreamble,
+      cond              = job.cond,
+      permissions       = job.permissions,
+      env               = job.env,
+      oses              = job.oses,
+      scalas            = job.scalas,
+      javas             = job.javas,
+      needs             = job.needs,
+      matrixFailFast    = job.matrixFailFast,
+      matrixAdds        = job.matrixAdds,
+      matrixIncs        = job.matrixIncs,
+      matrixExcs        = job.matrixExcs,
+      runsOnExtraLabels = job.runsOnExtraLabels,
+      container         = job.container,
+      environment       = job.environment,
+      concurrency       = job.concurrency,
+      timeoutMinutes    = job.timeoutMinutes,
+    )
   }
   val yml = baseDirectory.value / ".github" / "workflows" / "site.yml"
   val rendered = GenerativePlugin.compileJob(site, sbt)

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                % "0.4.7")
-addSbtPlugin("org.typelevel"      % "sbt-typelevel"          % "0.6.7")
-addSbtPlugin("org.typelevel"      % "sbt-typelevel-scalafix" % "0.6.7")
-addSbtPlugin("org.typelevel"      % "sbt-typelevel-site"     % "0.6.7")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel"          % "0.7.1")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel-scalafix" % "0.7.1")
+addSbtPlugin("org.typelevel"      % "sbt-typelevel-site"     % "0.7.1")
 addSbtPlugin("org.scala-js"       % "sbt-scalajs"            % "1.16.0")
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"       % "0.4.17")
 addSbtPlugin("org.scoverage"      % "sbt-scoverage"          % "2.0.11")