Skip to content

Commit

Permalink
Merge branch 'master' into update/ph-css-6.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
nafg authored Jan 17, 2022
2 parents 90f48e8 + 39e7333 commit 4d357be
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.13.7, 3.0.2]
scala: [2.13.8, 3.1.0]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [3.0.2]
scala: [3.1.0]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -101,22 +101,22 @@ 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
- name: Download target directories (3.0.2)
- name: Download target directories (3.1.0)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }}
name: target-${{ matrix.os }}-3.1.0-${{ matrix.java }}

- name: Inflate target directories (3.0.2)
- name: Inflate target directories (3.1.0)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ pull_request_rules:
- name: Automatically merge successful scala-steward PRs
conditions:
- author=scala-steward
- check-success=Build and Test (ubuntu-latest, 2.13.7, temurin@11)
- check-success=Build and Test (ubuntu-latest, 3.0.2, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.13.8, temurin@11)
- check-success=Build and Test (ubuntu-latest, 3.1.0, temurin@11)
actions:
queue:
name: default
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def myScalacOptions(version: String) =
inThisBuild(
List(
organization := "io.github.nafg.css-dsl",
scalaVersion := "3.0.2",
crossScalaVersions := Seq("2.13.7", scalaVersion.value),
scalaVersion := "3.1.0",
crossScalaVersions := Seq("2.13.8", scalaVersion.value),
scalacOptions ++= myScalacOptions(scalaVersion.value),
versionScheme := Some("early-semver")
)
Expand Down
2 changes: 1 addition & 1 deletion project/build.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.31"
libraryDependencies += "org.scalameta" %% "scalameta" % "4.4.32"
libraryDependencies += "com.helger" % "ph-css" % "6.4.3"

0 comments on commit 4d357be

Please sign in to comment.