Skip to content

Commit

Permalink
Attempt cross-build to scala 3
Browse files Browse the repository at this point in the history
  • Loading branch information
dimitarg committed Oct 30, 2024
1 parent 9877049 commit f71ae78
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
14 changes: 11 additions & 3 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.15, 2.12.20]
scala: [2.13.15, 2.12.20, 3.3.4]
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -54,8 +54,6 @@ jobs:
HONEYCOMB_WRITE_KEY: ${{ secrets.HONEYCOMB_WRITE_KEY }}
run: sbt '++ ${{ matrix.scala }}' test

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

- name: Compress target directories
run: tar cf targets.tar target project/target

Expand Down Expand Up @@ -112,6 +110,16 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (3.3.4)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-3.3.4-${{ matrix.java }}

- name: Inflate target directories (3.3.4)
run: |
tar xf targets.tar
rm targets.tar
- run: |
git config user.name "Github Actions (dimitarg/weaver-test-extra)"
git config user.email "[email protected]"
Expand Down
11 changes: 6 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ name := "weaver-test-extra"
ThisBuild / organization := "io.github.dimitarg"

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

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

Expand Down Expand Up @@ -34,9 +34,10 @@ ThisBuild / githubWorkflowPublishTargetBranches += RefPredicate.Equals(Ref.Branc

ThisBuild / licenses += ("Apache-2.0", url("https://opensource.org/licenses/Apache-2.0"))

ThisBuild / githubWorkflowBuildPostamble := Seq(WorkflowStep.Run(
commands = List("bash <(curl -s https://codecov.io/bash)")
))
// scoverage plugin not yet supporting scala 2.13.15
// ThisBuild / githubWorkflowBuildPostamble := Seq(WorkflowStep.Run(
// commands = List("bash <(curl -s https://codecov.io/bash)")
// ))

ThisBuild / githubWorkflowPublishPreamble := Seq(WorkflowStep.Run(
List(
Expand Down

0 comments on commit f71ae78

Please sign in to comment.