From 857ea02d5c968659fbf7a5f7d3a07e3bee897970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Sat, 29 May 2021 02:05:57 +0200 Subject: [PATCH] Remove 2.12.11, add 2.12.14 --- .github/workflows/ci.yml | 20 ++++++++++---------- .mergify.yml | 2 +- build.sbt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a546a6c..3b558f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,9 +28,9 @@ jobs: matrix: os: [ubuntu-latest] scala: - - 2.12.11 - 2.12.12 - 2.12.13 + - 2.12.14 - 2.13.4 - 2.13.5 - 2.13.6 @@ -108,32 +108,32 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.11) + - name: Download target directories (2.12.12) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.11-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }} - - name: Inflate target directories (2.12.11) + - name: Inflate target directories (2.12.12) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.12) + - name: Download target directories (2.12.13) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.12-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }} - - name: Inflate target directories (2.12.12) + - name: Inflate target directories (2.12.13) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12.13) + - name: Download target directories (2.12.14) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.13-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.14-${{ matrix.java }} - - name: Inflate target directories (2.12.13) + - name: Inflate target directories (2.12.14) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index ace740d..4d00065 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,9 +2,9 @@ pull_request_rules: - name: automatically merge Scala Steward PRs on CI success conditions: - author=scala-steward - - status-success="Build and Test (ubuntu-latest, 2.12.11, graalvm-ce-java11@20.3.0)" - status-success="Build and Test (ubuntu-latest, 2.12.12, graalvm-ce-java11@20.3.0)" - status-success="Build and Test (ubuntu-latest, 2.12.13, graalvm-ce-java11@20.3.0)" + - status-success="Build and Test (ubuntu-latest, 2.12.14, graalvm-ce-java11@20.3.0)" - status-success="Build and Test (ubuntu-latest, 2.13.4, graalvm-ce-java11@20.3.0)" - status-success="Build and Test (ubuntu-latest, 2.13.5, graalvm-ce-java11@20.3.0)" - status-success="Build and Test (ubuntu-latest, 2.13.6, graalvm-ce-java11@20.3.0)" diff --git a/build.sbt b/build.sbt index b9785bf..d4a05a7 100644 --- a/build.sbt +++ b/build.sbt @@ -29,9 +29,9 @@ ThisBuild / resolvers += Resolver.JCenterRepository ThisBuild / scalaVersion := "3.0.0" ThisBuild / crossScalaVersions := Seq( - "2.12.11", "2.12.12", "2.12.13", + "2.12.14", // "2.13.4", "2.13.5",