Skip to content

Commit 0b79e1a

Browse files
authored
Merge pull request #217 from rossabaker/ce-2.4
Update all the things
2 parents 11ea759 + 851c1c0 commit 0b79e1a

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ name: Continuous Integration
99

1010
on:
1111
pull_request:
12-
branches: ['*']
12+
branches: ['*', series/*]
1313
push:
14-
branches: ['*']
14+
branches: ['*', series/*]
1515
tags: [v*, v*]
1616

1717
env:
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: [ubuntu-latest]
29-
scala: [2.12.13, 2.13.4, 3.0.0-M3, 3.0.0-RC1]
29+
scala: [2.12.13, 2.13.5, 3.0.0-M3, 3.0.0-RC1]
3030
java: [adopt@1.8]
3131
runs-on: ${{ matrix.os }}
3232
steps:
@@ -88,7 +88,7 @@ jobs:
8888
strategy:
8989
matrix:
9090
os: [ubuntu-latest]
91-
scala: [2.13.4]
91+
scala: [2.13.5]
9292
java: [adopt@1.8]
9393
runs-on: ${{ matrix.os }}
9494
steps:
@@ -124,12 +124,12 @@ jobs:
124124
tar xf targets.tar
125125
rm targets.tar
126126
127-
- name: Download target directories (2.13.4)
127+
- name: Download target directories (2.13.5)
128128
uses: actions/download-artifact@v2
129129
with:
130-
name: target-${{ matrix.os }}-2.13.4-${{ matrix.java }}
130+
name: target-${{ matrix.os }}-2.13.5-${{ matrix.java }}
131131

132-
- name: Inflate target directories (2.13.4)
132+
- name: Inflate target directories (2.13.5)
133133
run: |
134134
tar xf targets.tar
135135
rm targets.tar

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
33
val Scala212 = "2.12.13"
44

55
ThisBuild / baseVersion := "2.1"
6-
ThisBuild / crossScalaVersions := Seq(Scala212, "2.13.4", "3.0.0-M3", "3.0.0-RC1")
6+
ThisBuild / crossScalaVersions := Seq(Scala212, "2.13.5", "3.0.0-M3", "3.0.0-RC1")
77
ThisBuild / scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last
88
ThisBuild / publishFullName := "Christopher Davenport"
99
ThisBuild / publishGithubUser := "christopherdavenport"
@@ -46,6 +46,7 @@ ThisBuild / githubWorkflowBuild := Seq(
4646
List("docs/makeMicrosite"),
4747
cond = Some(Scala212Cond)))
4848

49+
ThisBuild / githubWorkflowTargetBranches := List("*", "series/*")
4950
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
5051

5152
// currently only publishing tags
@@ -91,8 +92,8 @@ lazy val docs = project.in(file("docs"))
9192
.enablePlugins(MdocPlugin)
9293

9394
val catsV = "2.4.2"
94-
val catsEffectV = "2.3.3"
95-
val uniqueV = "2.1.1"
95+
val catsEffectV = "2.4.0"
96+
val uniqueV = "2.1.2"
9697
val disciplineSpecs2V = "1.1.4"
9798
val specs2V = "4.10.6"
9899

0 commit comments

Comments
 (0)