From 6f7a280fbb62f9a9cbd251d6731fe34329572263 Mon Sep 17 00:00:00 2001 From: "slick-scala-steward[bot]" <243981+slick-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:14:41 +0000 Subject: [PATCH 1/2] Update scala-library to 2.12.20 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d484d8..7fba173 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17, 2.13.10] + scala: [2.12.20, 2.13.10] java: [temurin@11] runs-on: ${{ matrix.os }} steps: @@ -72,7 +72,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.17] + scala: [2.12.20] java: [temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index f950f6f..ccdbcaf 100644 --- a/build.sbt +++ b/build.sbt @@ -16,8 +16,8 @@ mergifyExtraConditions := Seq( inThisBuild(Seq( organization := "com.rms.miu", - scalaVersion := "2.12.17", - crossScalaVersions := Seq("2.12.17", "2.13.10"), + scalaVersion := "2.12.20", + crossScalaVersions := Seq("2.12.20", "2.13.10"), scalacOptions ++= Seq( "-deprecation", From 386c5999924b1a36fb03830f587c5165e7b8d44f Mon Sep 17 00:00:00 2001 From: "slick-scala-steward[bot]" <243981+slick-scala-steward[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 16:14:56 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- .mergify.yml | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fba173..1950d5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,12 +100,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.12.17) + - name: Download target directories (2.12.20) uses: actions/download-artifact@v2 with: - name: target-${{ matrix.os }}-2.12.17-${{ matrix.java }} + name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }} - - name: Inflate target directories (2.12.17) + - name: Inflate target directories (2.12.20) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 127451b..bd4a94b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -9,7 +9,8 @@ pull_request_rules: - author=scala-steward - author=slick-scala-steward[bot] - author=renovate[bot] - - check-success=Build and Test (ubuntu-latest, 2.12.17, temurin@11) + - check-success=Build and Test (ubuntu-latest, 2.12.20, temurin@11) - check-success=Build and Test (ubuntu-latest, 2.13.10, temurin@11) actions: - queue: {} + queue: + name: default