From a13ff2cfbd496413eb25848ed447047403e37bdc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 14 Jan 2024 17:16:21 +0000 Subject: [PATCH 1/2] Update sbt-typelevel-mergify to 0.6.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4f53c9b7b..10e8d0d03 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,6 +18,6 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") -addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.5") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7") From 70463fe61830f893272c3e2c7c66ef5dc14f9611 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 14 Jan 2024 17:17:32 +0000 Subject: [PATCH 2/2] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 050d2a29b..04e502f6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v')) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }} path: targets.tar @@ -109,7 +109,7 @@ jobs: run: sbt +update - name: Download target directories (2.12) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12 @@ -119,7 +119,7 @@ jobs: rm targets.tar - name: Download target directories (2.13) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 @@ -129,7 +129,7 @@ jobs: rm targets.tar - name: Download target directories (3) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3