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

Read default scala version from ThisBuild #118

Merged
merged 1 commit into from
Jan 30, 2022
Merged

Read default scala version from ThisBuild #118

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions core/src/main/scala/org/typelevel/sbt/TypelevelPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ object TypelevelPlugin extends AutoPlugin {
tlCiReleaseBranches := Seq("main"),
Def.derive(tlFatalWarnings := (tlFatalWarningsInCi.value && githubIsWorkflowBuild.value)),
githubWorkflowBuildMatrixExclusions ++= {
val defaultScala = (ThisBuild / scalaVersion).value
for {
// default scala is last in the list, default java first
scala <- githubWorkflowScalaVersions.value.init
java <- githubWorkflowJavaVersions.value.tail
scala <- githubWorkflowScalaVersions.value.filterNot(_ == defaultScala)
java <- githubWorkflowJavaVersions.value.tail // default java is head
} yield MatrixExclude(Map("scala" -> scala, "java" -> java.render))
},
githubWorkflowBuild := {
Expand Down
2 changes: 1 addition & 1 deletion site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ object TypelevelSitePlugin extends AutoPlugin {
WorkflowJob(
"site",
"Generate Site",
scalas = List(crossScalaVersions.value.last),
scalas = List((ThisBuild / scalaVersion).value),
javas = List(githubWorkflowJavaVersions.value.head),
steps =
githubWorkflowJobSetup.value.toList ++ tlSiteGenerate.value ++ tlSitePublish.value
Expand Down