From 0f8981e8564488909e82514f61b4a6906a68acd7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 16 Oct 2024 13:58:10 +0000 Subject: [PATCH 1/3] Update sbt-circe-org to 0.4.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 29980161..244a94dd 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") -addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.2") +addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.5") From c2e5af6f7b115dcee7f5106c6ced60f90544ab8c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 16 Oct 2024 13:59:52 +0000 Subject: [PATCH 2/3] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index be0c0884..decffa14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,8 +42,7 @@ jobs: timeout-minutes: 60 steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -132,8 +131,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 @@ -252,7 +250,7 @@ jobs: dependency-submission: name: Submit Dependencies - if: github.event_name != 'pull_request' + if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] @@ -260,8 +258,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install sbt - if: contains(runner.os, 'macos') - run: brew install sbt + uses: sbt/setup-sbt@v1 - name: Checkout current branch (full) uses: actions/checkout@v4 From daa90ef9d5e4698c33d436a9a531165cebae1453 Mon Sep 17 00:00:00 2001 From: Erlend Hamnaberg Date: Mon, 28 Oct 2024 17:12:42 +0100 Subject: [PATCH 3/3] Use built-in codecov action --- .github/workflows/ci.yml | 9 ++++++--- build.sbt | 23 +---------------------- project/plugins.sbt | 3 +-- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index decffa14..644d4acc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -302,10 +302,13 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.14] + scala: [2.12, 2.13] java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (fast) uses: actions/checkout@v4 @@ -324,6 +327,6 @@ jobs: - run: sbt '++ ${{ matrix.scala }}' coverage rootJVM/test coverageAggregate - - uses: codecov/codecov-action@v4 + - uses: codecov/codecov-action@v3 with: - flags: ${{matrix.scala}},${{matrix.java}} + flags: ${{matrix.scala}} diff --git a/build.sbt b/build.sbt index 684aba8f..925eaa3a 100644 --- a/build.sbt +++ b/build.sbt @@ -22,28 +22,7 @@ ThisBuild / githubWorkflowJavaVersions := Seq("8", "17").map(JavaSpec.temurin) ThisBuild / tlCiScalafmtCheck := true -ThisBuild / githubWorkflowAddedJobs ++= Seq( - WorkflowJob( - id = "coverage", - name = "Generate coverage report", - scalas = List(Scala213V), - steps = List(WorkflowStep.Checkout) ++ WorkflowStep.SetupJava( - List(githubWorkflowJavaVersions.value.last) - ) ++ githubWorkflowGeneratedCacheSteps.value ++ List( - WorkflowStep.Sbt(List("coverage", "rootJVM/test", "coverageAggregate")), - WorkflowStep.Use( - UseRef.Public( - "codecov", - "codecov-action", - "v4" - ), - params = Map( - "flags" -> List("${{matrix.scala}}", "${{matrix.java}}").mkString(",") - ) - ) - ) - ) -) +ThisBuild / circeRootOfCodeCoverage := Some("rootJVM") def do_configure(project: Project) = project.settings( Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index 244a94dd..897f9915 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,4 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") addSbtPlugin("io.circe" % "sbt-circe-org" % "0.4.5")