Skip to content

Commit

Permalink
529 - fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
regis-leray committed Oct 10, 2024
1 parent a8616ca commit bd8a17d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
18 changes: 15 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import BuildHelper._
import BuildHelper.*
import zio.sbt.githubactions.Job

def ciJobWithSetup(job: Job) = job.copy(runsOn = "ubuntu-22.04")

inThisBuild(
List(
Expand All @@ -15,7 +18,14 @@ inThisBuild(
pgpSecretRing := file("/tmp/secret.asc"),
scmInfo := Some(
ScmInfo(url("https://github.com/zio/zio-s3/"), "scm:git:[email protected]:zio/zio-s3.git")
)
),
ciEnabledBranches := Seq("master"),
ciTestJobs := ciTestJobs.value.map(ciJobWithSetup),
ciLintJobs := ciLintJobs.value.map(ciJobWithSetup),
ciBuildJobs := ciBuildJobs.value.map(ciJobWithSetup),
ciReleaseJobs := ciReleaseJobs.value.map(ciJobWithSetup),
ciUpdateReadmeJobs := ciUpdateReadmeJobs.value.map(ciJobWithSetup),
ciPostReleaseJobs := ciPostReleaseJobs.value.map(ciJobWithSetup),
)
)

Expand All @@ -25,6 +35,9 @@ addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck"
val zioVersion = "2.0.21"
val awsVersion = "2.25.70"




lazy val root =
project.in(file(".")).settings(publish / skip := true).aggregate(`zio-s3`, docs)

Expand Down Expand Up @@ -58,7 +71,6 @@ lazy val docs = project
projectName := "ZIO S3",
mainModuleName := (`zio-s3` / moduleName).value,
projectStage := ProjectStage.ProductionReady,
docsPublishBranch := "series/2.x",
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(`zio-s3`),
//conflict with the dependency zio-nio & sbt-mdoc
excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_3"
Expand Down
4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.3.2")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.5")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.4")
addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.4.0-alpha.28")
addSbtPlugin("dev.zio" % "zio-sbt-ci" % "0.4.0-alpha.28")

addDependencyTreePlugin
resolvers ++= Resolver.sonatypeOssRepos("public")

0 comments on commit bd8a17d

Please sign in to comment.