Skip to content

Commit

Permalink
remove ciExtraTestSteps from setting keys. (#291)
Browse files Browse the repository at this point in the history
  • Loading branch information
khajavi authored Sep 18, 2023
1 parent 4116a7c commit f718daf
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions zio-sbt-ci/src/main/scala/zio/sbt/ZioSbtCiPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ object ZioSbtCiPlugin extends AutoPlugin {
val ciReleaseApprovalJobs: SettingKey[Seq[String]] =
settingKey[Seq[String]]("Job IDs that need to pass before a new release.")
val ciWorkflowName: SettingKey[String] = settingKey[String]("CI Workflow Name")
val ciExtraTestSteps: SettingKey[Seq[Step]] = settingKey[Seq[Step]]("Extra test steps")
val ciSwapSizeGB: SettingKey[Int] = settingKey[Int]("Swap size, default is 0")
val ciBackgroundJobs: SettingKey[Seq[String]] = settingKey[Seq[String]]("Background jobs")
val ciBuildJobs: SettingKey[Seq[Job]] = settingKey[Seq[Job]]("CI Build Jobs")
Expand Down Expand Up @@ -146,7 +145,6 @@ object ZioSbtCiPlugin extends AutoPlugin {
val setSwapSpace = SetSwapSpace.value
val checkout = Checkout.value
val backgroundJobs = ciBackgroundJobs.value
val extraTestSteps = ciExtraTestSteps.value // TODO: do we need this sbt setting, I don't think so!

val prefixJobs = makePrefixJobs(backgroundJobs)

Expand Down Expand Up @@ -214,7 +212,7 @@ object ZioSbtCiPlugin extends AutoPlugin {
)
else Seq.empty).flatten.toSeq
})
} ++ extraTestSteps
}
)
}

Expand Down Expand Up @@ -288,7 +286,7 @@ object ZioSbtCiPlugin extends AutoPlugin {
)

}
) ++ extraTestSteps
)
)

val DefaultTestStrategy =
Expand All @@ -312,7 +310,7 @@ object ZioSbtCiPlugin extends AutoPlugin {
name = "Test",
run = Some(prefixJobs + "sbt +test")
)
) ++ extraTestSteps
)
)

if (javaPlatformMatrix.isEmpty && scalaVersionMatrix.isEmpty)
Expand Down Expand Up @@ -576,7 +574,6 @@ object ZioSbtCiPlugin extends AutoPlugin {
ciNodeOptions := Seq.empty,
ciUpdateReadmeCondition := None,
ciGroupSimilarTests := false,
ciExtraTestSteps := Seq.empty,
ciSwapSizeGB := 0,
ciTargetJavaVersions := Seq("8", "11", "17"),
ciCheckArtifactsBuildSteps :=
Expand Down

0 comments on commit f718daf

Please # to comment.