From 34d5a1d3509c05229fc33e997ca4f4b37fd8709d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 19 Dec 2024 13:09:47 +0000 Subject: [PATCH 1/2] Update sbt-ci-release to 1.9.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 274d1cd..4c08406 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") addSbtPlugin("io.github.zamblauskas" % "sbt-examplestest" % "0.3.0") From 106f7cc2e35e7b7d071358f6a51e0e8b6973e1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Wed, 1 Jan 2025 16:20:09 +0200 Subject: [PATCH 2/2] sbt action and java version --- .github/workflows/auto-approve.yaml | 2 +- .github/workflows/ci.yml | 6 ++++-- .github/workflows/release.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-approve.yaml b/.github/workflows/auto-approve.yaml index 3a46e82..af39fbe 100644 --- a/.github/workflows/auto-approve.yaml +++ b/.github/workflows/auto-approve.yaml @@ -1,6 +1,6 @@ name: Auto approve and merge dependency bump PRs -on: pull_request +on: pull_request_target permissions: contents: write diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 758973c..331a4fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,9 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 21 cache: sbt + - uses: sbt/setup-sbt@v1 - run: sbt --client scalafmtCheckAll - run: sbt --client scalafmtSbtCheck @@ -37,8 +38,9 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 21 cache: sbt + - uses: sbt/setup-sbt@v1 - run: sbt --client +compile - run: sbt --client +test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c006212..969a35f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 17 + java-version: 21 cache: sbt - run: sbt ci-release