From 8d1092f9c3b067aa6f047a3f8a603dba558d55c0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 13 Sep 2023 02:39:39 +0000 Subject: [PATCH 1/4] Update scala-library to 2.13.12 --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aea8de3fc9..ea712ec457 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.11] + scala: [2.13.12] java: [temurin@17, temurin@11] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 9638f263d1..5107ea2ebb 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map( "dummy" -> List(JVMPlatform) ) -val Scala213 = "2.13.11" +val Scala213 = "2.13.12" /// sbt-typelevel configuration From 427531f7672c405da6a8977cf1fc7d9f87740f67 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 13 Sep 2023 02:40:47 +0000 Subject: [PATCH 2/4] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 +++--- .mergify.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea712ec457..59893e8020 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,12 +159,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.11) + - name: Download target directories (2.13.12) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11 + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12 - - name: Inflate target directories (2.13.11) + - name: Inflate target directories (2.13.12) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index cc069a7ce6..5d473e0d63 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -17,8 +17,8 @@ pull_request_rules: - name: merge scala-steward's PRs conditions: - author=scala-steward - - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@17) - - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@11) + - status-success=Build and Test (ubuntu-latest, 2.13.12, temurin@17) + - status-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11) actions: merge: method: squash From 4bfbb748e5b6e5c213f668fe3865067eccb5b96c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 14 Sep 2023 02:47:35 +0000 Subject: [PATCH 3/4] Revert commit(s) 427531f7, 8d1092f9 --- .github/workflows/ci.yml | 8 ++++---- .mergify.yml | 4 ++-- build.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59893e8020..aea8de3fc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.12] + scala: [2.13.11] java: [temurin@17, temurin@11] runs-on: ${{ matrix.os }} steps: @@ -159,12 +159,12 @@ jobs: ~/Library/Caches/Coursier/v1 key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - name: Download target directories (2.13.12) + - name: Download target directories (2.13.11) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.12 + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.11 - - name: Inflate target directories (2.13.12) + - name: Inflate target directories (2.13.11) run: | tar xf targets.tar rm targets.tar diff --git a/.mergify.yml b/.mergify.yml index 5d473e0d63..cc069a7ce6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -17,8 +17,8 @@ pull_request_rules: - name: merge scala-steward's PRs conditions: - author=scala-steward - - status-success=Build and Test (ubuntu-latest, 2.13.12, temurin@17) - - status-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11) + - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@17) + - status-success=Build and Test (ubuntu-latest, 2.13.11, temurin@11) actions: merge: method: squash diff --git a/build.sbt b/build.sbt index 5107ea2ebb..9638f263d1 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map( "dummy" -> List(JVMPlatform) ) -val Scala213 = "2.13.12" +val Scala213 = "2.13.11" /// sbt-typelevel configuration From daa2f3ab98a55e030bdd344d3e05a908bf130d19 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 14 Sep 2023 02:47:45 +0000 Subject: [PATCH 4/4] Update scala-library to 2.13.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9638f263d1..5107ea2ebb 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map( "dummy" -> List(JVMPlatform) ) -val Scala213 = "2.13.11" +val Scala213 = "2.13.12" /// sbt-typelevel configuration