From 4d35c02193482598b9507be27eaefc2b254613f9 Mon Sep 17 00:00:00 2001 From: Shubham Girdhar Date: Fri, 14 Jan 2022 17:28:43 +0530 Subject: [PATCH] maintenance: workflow scala version --- .github/workflows/ci.yml | 4 ++-- project/BenchmarkWorkFlow.scala | 2 ++ project/ScoverageWorkFlow.scala | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9d303fffa..a3490d1761 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,7 +201,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.6] + scala: [2.13.7] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -234,7 +234,7 @@ jobs: strategy: matrix: os: [centos] - scala: [2.13.6] + scala: [2.13.7] java: [temurin@11] runs-on: [ "${{ matrix.os }}", zio-http ] steps: diff --git a/project/BenchmarkWorkFlow.scala b/project/BenchmarkWorkFlow.scala index acfd278b00..a2757abda1 100644 --- a/project/BenchmarkWorkFlow.scala +++ b/project/BenchmarkWorkFlow.scala @@ -1,3 +1,4 @@ +import BuildHelper.Scala213 import sbtghactions.GenerativePlugin.autoImport.{UseRef, WorkflowJob, WorkflowStep} object BenchmarkWorkFlow { @@ -10,6 +11,7 @@ object BenchmarkWorkFlow { cond = Some( "${{ github.event_name == 'pull_request'}}", ), + scalas = List(Scala213), steps = List( WorkflowStep.Run( env = Map("GITHUB_TOKEN" -> "${{secrets.ACTIONS_PAT}}"), diff --git a/project/ScoverageWorkFlow.scala b/project/ScoverageWorkFlow.scala index 61dd8f5210..13fbf07f39 100644 --- a/project/ScoverageWorkFlow.scala +++ b/project/ScoverageWorkFlow.scala @@ -1,5 +1,6 @@ +import BuildHelper.{Scala213, ScoverageVersion} import sbtghactions.GenerativePlugin.autoImport.{WorkflowJob, WorkflowStep} -import BuildHelper.{ScoverageVersion, Scala213} + object ScoverageWorkFlow { // TODO move plugins to plugins.sbt after scoverage's support for Scala 3 val scoveragePlugin = s"""addSbtPlugin("org.scoverage" % "sbt-scoverage" % "${ScoverageVersion}")""" @@ -12,6 +13,7 @@ object ScoverageWorkFlow { WorkflowJob( id = "unsafeRunScoverage", name = "Unsafe Scoverage", + scalas = List(Scala213), steps = List( WorkflowStep.CheckoutFull, WorkflowStep.Run(