Skip to content

Commit

Permalink
Merge pull request #30 from dvgica/scala-2.12.19
Browse files Browse the repository at this point in the history
Bump 2.12
  • Loading branch information
dvgica authored Feb 28, 2024
2 parents feb6d45 + 122089c commit ea787d5
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.13, 2.12.18, 3.3.1]
scala: [2.13.13, 2.12.19, 3.3.1]
java: [temurin@11]
runs-on: ${{ matrix.os }}
steps:
Expand Down Expand Up @@ -92,12 +92,12 @@ jobs:
tar xf targets.tar
rm targets.tar
- name: Download target directories (2.12.18)
- name: Download target directories (2.12.19)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
name: target-${{ matrix.os }}-2.12.19-${{ matrix.java }}

- name: Inflate target directories (2.12.18)
- name: Inflate target directories (2.12.19)
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 @@ -3,15 +3,15 @@ queue_rules:
conditions:
- check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.13.13, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.12.18, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@11)

pull_request_rules:
- name: Merge using the merge queue
conditions:
- base=main
- check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.13.13, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.12.18, temurin@11)
- check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@11)
- author=scala-steward
actions:
queue:
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.18"
val scala212Version = "2.12.19"
val scala213Version = "2.13.13"
val scala3Version = "3.3.1"
val scalaVersions =
Expand Down

0 comments on commit ea787d5

Please sign in to comment.