Skip to content

Commit

Permalink
Merge pull request #105 from scala-steward/update/scala-library-2.13.10
Browse files Browse the repository at this point in the history
Update scala-library to 2.13.10
  • Loading branch information
dvgica authored Oct 26, 2022
2 parents f0151b6 + d05217c commit 87d5792
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 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.8, 2.12.16, 3.0.2]
scala: [2.13.10, 2.12.16, 3.0.2]
java: [temurin@8]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -104,12 +104,12 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

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

- name: Inflate target directories (2.13.8)
- name: Inflate target directories (2.13.10)
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 @@ -2,15 +2,15 @@ queue_rules:
- name: dependency-update
conditions:
- check-success=Build and Test (ubuntu-latest, 3.0.2, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.13.8, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.12.16, temurin@8)

pull_request_rules:
- name: Merge using the merge queue
conditions:
- base=main
- check-success=Build and Test (ubuntu-latest, 3.0.2, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.13.8, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.12.16, temurin@8)
- author=scala-steward
actions:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inThisBuild(
)

val scala212Version = "2.12.16"
val scala213Version = "2.13.8"
val scala213Version = "2.13.10"
val scala3Version = "3.0.2"
val scalaVersions =
Seq(
Expand Down

0 comments on commit 87d5792

Please sign in to comment.