Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dimitarg committed Oct 29, 2024
1 parent e3d4a22 commit 44b87de
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.14, 2.12.20]
scala: [2.13.15, 2.12.20]
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -52,9 +52,7 @@ jobs:

- env:
HONEYCOMB_WRITE_KEY: ${{ secrets.HONEYCOMB_WRITE_KEY }}
run: sbt '++ ${{ matrix.scala }}' coverage test

- run: sbt '++ ${{ matrix.scala }}' coverageReport
run: sbt '++ ${{ matrix.scala }}' test

- run: 'bash <(curl -s https://codecov.io/bash)'

Expand All @@ -74,7 +72,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.14]
scala: [2.13.15]
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -94,12 +92,12 @@ jobs:
- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Download target directories (2.13.14)
- name: Download target directories (2.13.15)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }}

- name: Inflate target directories (2.13.14)
- name: Inflate target directories (2.13.15)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
14 changes: 9 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,24 @@ import ReleaseTransformations._
name := "weaver-test-extra"
ThisBuild / organization := "io.github.dimitarg"

ThisBuild / scalaVersion := "2.13.14"
ThisBuild / crossScalaVersions := Seq("2.13.14", "2.12.20")
ThisBuild / githubWorkflowScalaVersions := Seq("2.13.14", "2.12.20")
ThisBuild / scalaVersion := "2.13.15"
ThisBuild / crossScalaVersions := Seq("2.13.15", "2.12.20")
ThisBuild / githubWorkflowScalaVersions := Seq("2.13.15", "2.12.20")

ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21"))

ThisBuild / githubWorkflowBuild := Seq(
WorkflowStep.Sbt(
commands = List("coverage", "test"),
// scoverage plugin not yet supporting scala 2.13.15
// commands = List("coverage", "test"),
commands = List("test"),

env = Map(
"HONEYCOMB_WRITE_KEY" -> "${{ secrets.HONEYCOMB_WRITE_KEY }}",
)
),
WorkflowStep.Sbt(List("coverageReport")),
// scoverage plugin not yet supporting scala 2.13.15
// WorkflowStep.Sbt(List("coverageReport")),
)
ThisBuild / githubWorkflowEnv += "CODECOV_TOKEN" -> "${{ secrets.CODECOV_TOKEN }}"
ThisBuild / githubWorkflowEnv += "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}"
Expand Down
3 changes: 2 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
// scoverage plugin not yet supporting scala 2.13.15
// addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.0")

0 comments on commit 44b87de

Please sign in to comment.