From 6cb944f837556bde290b8c63271bd1405e51ac29 Mon Sep 17 00:00:00 2001 From: Kyri Petrou Date: Thu, 9 May 2024 20:31:31 +1000 Subject: [PATCH 1/2] Bump versions --- .github/workflows/ci.yml | 40 ++++++++++++++++++++-------------------- build.sbt | 4 ++-- project/plugins.sbt | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3555a4ad..eaee5131 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,19 +22,19 @@ jobs: continue-on-error: true steps: - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v4.2.1 + uses: actions/setup-java@v4 with: distribution: corretto java-version: '17' check-latest: true - name: Cache Dependencies - uses: coursier/cache-action@v6.4.5 + uses: coursier/cache-action@v6 - name: Check all code compiles run: sbt +Test/compile - name: Check artifacts build process @@ -49,19 +49,19 @@ jobs: continue-on-error: false steps: - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v4.2.1 + uses: actions/setup-java@v4 with: distribution: corretto java-version: '17' check-latest: true - name: Cache Dependencies - uses: coursier/cache-action@v6.4.5 + uses: coursier/cache-action@v6 - name: Check if the site workflow is up to date run: sbt ciCheckGithubWorkflow - name: Lint @@ -88,15 +88,15 @@ jobs: - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v4.2.1 + uses: actions/setup-java@v4 with: distribution: corretto java-version: ${{ matrix.java }} check-latest: true - name: Cache Dependencies - uses: coursier/cache-action@v6.4.5 + uses: coursier/cache-action@v6 - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Test @@ -108,19 +108,19 @@ jobs: if: ${{ github.event_name == 'push' }} steps: - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v4.2.1 + uses: actions/setup-java@v4 with: distribution: corretto java-version: '17' check-latest: true - name: Cache Dependencies - uses: coursier/cache-action@v6.4.5 + uses: coursier/cache-action@v6 - name: Generate Readme run: sbt docs/generateReadme - name: Commit Changes @@ -137,7 +137,7 @@ jobs: app_private_key: ${{ secrets.APP_PRIVATE_KEY }} - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v6.0.2 + uses: peter-evans/create-pull-request@v6 with: body: |- Autogenerated changes after running the `sbt docs/generateReadme` command of the [zio-sbt-website](https://zio.dev/zio-sbt) plugin. @@ -182,19 +182,19 @@ jobs: if: ${{ github.event_name != 'pull_request' }} steps: - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v4.2.1 + uses: actions/setup-java@v4 with: distribution: corretto java-version: '17' check-latest: true - name: Cache Dependencies - uses: coursier/cache-action@v6.4.5 + uses: coursier/cache-action@v6 - name: Release run: sbt ci-release env: @@ -211,19 +211,19 @@ jobs: if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }} steps: - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: Install libuv run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala - uses: actions/setup-java@v4.2.1 + uses: actions/setup-java@v4 with: distribution: corretto java-version: '17' check-latest: true - name: Cache Dependencies - uses: coursier/cache-action@v6.4.5 + uses: coursier/cache-action@v6 - name: Setup NodeJs uses: actions/setup-node@v4 with: @@ -242,7 +242,7 @@ jobs: if: ${{ (github.event_name == 'release') && (github.event.action == 'published') }} steps: - name: Git Checkout - uses: actions/checkout@v4.1.1 + uses: actions/checkout@v4 with: fetch-depth: '0' - name: notify the main repo about the new release of docs package diff --git a/build.sbt b/build.sbt index e8bfd853..524eb7d0 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,7 @@ crossScalaVersions := Seq.empty inThisBuild( List( name := "ZIO Query", - zioVersion := "2.0.22", + zioVersion := "2.1.0", developers := List( Developer( "kyri-petrou", @@ -54,7 +54,7 @@ lazy val zioQuery = crossProject(JSPlatform, JVMPlatform) .settings(scalacOptions += "-Wconf:msg=[zio.stacktracer.TracingImplicits.disableAutoTrace]:silent") .settings( libraryDependencies ++= Seq( - "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0" + "org.scala-lang.modules" %% "scala-collection-compat" % "2.12.0" ), scalacOptions ++= (if (scalaBinaryVersion.value == "3") diff --git a/project/plugins.sbt b/project/plugins.sbt index d64bcfa5..2ed5e2c4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -val zioSbtVersion = "0.4.0-alpha.25" +val zioSbtVersion = "0.4.0-alpha.26" addSbtPlugin("dev.zio" % "zio-sbt-ecosystem" % zioSbtVersion) addSbtPlugin("dev.zio" % "zio-sbt-website" % zioSbtVersion) From a423e5cb5c6845a58ebcb5d348732bae0403761e Mon Sep 17 00:00:00 2001 From: Kyri Petrou Date: Fri, 10 May 2024 11:35:50 +1000 Subject: [PATCH 2/2] Manually exclude ScalaJS 2.12 from tests --- .github/workflows/ci.yml | 14 ++++------- build.sbt | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eaee5131..91ea4c82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,18 +75,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.13 zioQueryJS + - ++3.3 zioQueryJS steps: - - name: Install libuv - run: sudo apt-get update && sudo apt-get install -y libuv1-dev - name: Setup Scala uses: actions/setup-java@v4 with: diff --git a/build.sbt b/build.sbt index 524eb7d0..ddcca2d8 100644 --- a/build.sbt +++ b/build.sbt @@ -2,6 +2,7 @@ import com.typesafe.tools.mima.core.* import explicitdeps.ExplicitDepsPlugin.autoImport.moduleFilterRemoveValue import sbtcrossproject.CrossPlugin.autoImport.crossProject import zio.sbt.githubactions.* +import _root_.io.circe.syntax.* enablePlugins(ZioSbtEcosystemPlugin, ZioSbtCiPlugin) @@ -127,3 +128,55 @@ ThisBuild / ciCheckArtifactsBuildSteps += "Check binary compatibility", run = Some("sbt \"+zioQueryJVM/mimaReportBinaryIssues; +zioQueryJS/mimaReportBinaryIssues\"") ) + +// Temporary, until zio-test issue with ScalaJS 2.12 is resolved +ThisBuild / ciTestJobs := Seq( + Job( + id = "test", + name = "Test", + runsOn = "ubuntu-latest", + timeoutMinutes = 15, + continueOnError = false, + strategy = Some( + Strategy( + matrix = Map( + "java" -> List("11", "21"), + "scala-project" -> List( + "++2.12 zioQueryJVM", + "++2.13 zioQueryJVM", + "++3.3 zioQueryJVM", + "++2.13 zioQueryJS", + "++3.3 zioQueryJS" + ) + ), + failFast = false + ) + ), + steps = List( + Step.SingleStep( + name = "Setup Scala", + uses = Some(ActionRef("actions/setup-java@v4")), + parameters = Map( + "distribution" -> "corretto".asJson, + "java-version" -> "${{ matrix.java }}".asJson, + "check-latest" -> true.asJson + ) + ), + Step.SingleStep( + name = "Cache Dependencies", + uses = Some(ActionRef("coursier/cache-action@v6")) + ), + Step.SingleStep( + name = "Git Checkout", + uses = Some(ActionRef("actions/checkout@v4")), + parameters = Map( + "fetch-depth" -> "0".asJson + ) + ), + Step.SingleStep( + name = "Test", + run = Some("sbt ${{ matrix.scala-project }}/test") + ) + ) + ) +)