Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ciExtraTestSteps From Setting Keys #291

Merged
merged 1 commit into from
Sep 18, 2023
Merged

Remove ciExtraTestSteps From Setting Keys #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions zio-sbt-ci/src/main/scala/zio/sbt/ZioSbtCiPlugin.scala
View file
Open in desktop
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 @@ -577,7 +575,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