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

Update CI and plugin versions #492

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Update CI and plugin versions #492

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
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ env:
pull_request:
branches-ignore:
- gh-pages
concurrency:
group: ${{ github.workflow }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.run_id || github.ref }}
cancel-in-progress: true
jobs:
build:
name: Build
Expand Down Expand Up @@ -75,15 +78,14 @@ jobs:
matrix:
java:
- '11'
- '17'
- '21'
scala-project:
- ++2.12.19 zioQueryJVM
- ++2.13.13 zioQueryJVM
- ++3.3.3 zioQueryJVM
- ++2.12.19 zioQueryJS
- ++2.13.13 zioQueryJS
- ++3.3.3 zioQueryJS
- ++2.12 zioQueryJVM
- ++2.13 zioQueryJVM
- ++3.3 zioQueryJVM
- ++2.12 zioQueryJS
- ++2.13 zioQueryJS
- ++3.3 zioQueryJS
steps:
- name: Install libuv
run: sudo apt-get update && sudo apt-get install -y libuv1-dev
Expand Down
18 changes: 11 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin)

crossScalaVersions := Seq.empty

lazy val scalaV = "2.13.14"
lazy val allScalas = List("2.12", "2.13", "3.3")

inThisBuild(
List(
name := "ZIO Query",
zioVersion := "2.1.4",
name := "ZIO Query",
zioVersion := "2.1.4",
scalaVersion := scalaV,
developers := List(
Developer(
"kyri-petrou",
Expand All @@ -19,11 +23,12 @@ inThisBuild(
url("https://github.com/kyri-petrou")
)
),
ciEnabledBranches := Seq("series/2.x"),
ciEnabledBranches := Seq("series/2.x"),
ciTargetJavaVersions := List("11", "21"),
ciTargetScalaVersions :=
Map(
(zioQueryJVM / thisProject).value.id -> (zioQueryJVM / crossScalaVersions).value,
(zioQueryJS / thisProject).value.id -> (zioQueryJS / crossScalaVersions).value
(zioQueryJVM / thisProject).value.id -> allScalas,
(zioQueryJS / thisProject).value.id -> allScalas
),
versionScheme := Some("early-semver")
)
Expand Down Expand Up @@ -96,8 +101,7 @@ lazy val docs = project
scalacOptions -= "-Xfatal-warnings",
projectName := (ThisBuild / name).value,
mainModuleName := (zioQueryJVM / moduleName).value,
scalaVersion := scala213.value,
crossScalaVersions := Seq(scala213.value),
crossScalaVersions := Seq(scalaV),
projectStage := ProjectStage.ProductionReady,
ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(zioQueryJVM)
)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val zioSbtVersion = "0.4.0-alpha.27"
val zioSbtVersion = "0.4.0-alpha.28"

addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion)
addSbtPlugin("dev.zio" % "zio-sbt-website" % zioSbtVersion)
Expand Down