Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge after v1.5.1 #591

Merged
merged 11 commits into from
Jan 14, 2022
55 changes: 49 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7, 2.12.15, 3.0.2]
scala: [2.13.8, 2.12.15, 3.0.2]
java: [temurin@8, temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7]
scala: [2.13.8]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -121,12 +121,12 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.13.7)
- name: Download target directories (2.13.8)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-2.13.7-${{ matrix.java }}
name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}

- name: Inflate target directories (2.13.7)
- name: Inflate target directories (2.13.8)
run: |
tar xf targets.tar
rm targets.tar
Expand Down Expand Up @@ -178,7 +178,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7, 2.12.15]
scala: [2.13.8, 2.12.15]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -216,6 +216,49 @@ jobs:
- name: Scalafmt
run: sbt ++${{ matrix.scala }} scalafmtCheckAll

headers:
name: Headers
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.8, 2.12.15, 3.0.2]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java (temurin@8)
if: matrix.java == 'temurin@8'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 8

- name: Setup Java (temurin@11)
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v2
with:
distribution: temurin
java-version: 11

- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier/cache/v1
~/.cache/coursier/v1
~/AppData/Local/Coursier/Cache/v1
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Headers
run: sbt ++${{ matrix.scala }} headerCheckAll

microsite:
name: Microsite
strategy:
Expand Down
17 changes: 13 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import sbtghactions.UseRef

val Scala213 = "2.13.7"
val Scala213 = "2.13.8"
val Scala212 = "2.12.15"
val Scala3 = "3.0.2"

enablePlugins(SonatypeCiReleasePlugin)

ThisBuild / organization := "org.typelevel"
ThisBuild / organizationName := "Typelevel"
ThisBuild / baseVersion := "2.1"
ThisBuild / baseVersion := "2.2"
ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, Scala3)
ThisBuild / scalaVersion := Scala213
ThisBuild / publishFullName := "Christopher Davenport"
Expand Down Expand Up @@ -50,6 +50,14 @@ ThisBuild / githubWorkflowAddedJobs ++= Seq(
// Awaiting release of https://github.com/scalameta/scalafmt/pull/2324/files
scalas = crossScalaVersions.value.toList.filter(_.startsWith("2."))
),
WorkflowJob(
"headers",
"Headers",
githubWorkflowJobSetup.value.toList ::: List(
WorkflowStep.Sbt(List("headerCheckAll"), name = Some("Headers"))
),
scalas = crossScalaVersions.value.toList
),
WorkflowJob(
"microsite",
"Microsite",
Expand All @@ -74,7 +82,7 @@ ThisBuild / githubWorkflowPublish := Seq(

val catsV = "2.7.0"
val catsEffectV = "3.3.4"
val slf4jV = "1.7.32"
val slf4jV = "1.7.33"
val munitCatsEffectV = "1.0.7"
val logbackClassicV = "1.2.10"

Expand Down Expand Up @@ -155,7 +163,8 @@ lazy val slf4j = project
lazy val commonSettings = Seq(
libraryDependencies ++= Seq(
"org.typelevel" %%% "munit-cats-effect-3" % munitCatsEffectV % Test
)
),
testFrameworks += new TestFramework("munit.Framework"),
)

lazy val releaseSettings = {
Expand Down