From 93a36dbdc7cf452dbd4616ae96893350bb89aae1 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Fri, 25 Oct 2024 00:01:55 +0000 Subject: [PATCH 01/14] Update flyway-database-postgresql to 10.20.1 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 892f2d439..5daf48f8e 100644 --- a/build.sbt +++ b/build.sbt @@ -19,7 +19,7 @@ val dbDependencies = Seq( "com.augustnagro" %% "magnum" % "1.3.0", "org.postgresql" % "postgresql" % "42.7.4", "com.zaxxer" % "HikariCP" % "6.0.0", - "org.flywaydb" % "flyway-database-postgresql" % "10.20.0" + "org.flywaydb" % "flyway-database-postgresql" % "10.20.1" ) val httpDependencies = Seq( From 0058923135e9b9565eb1be30aa8b64b642e5182e Mon Sep 17 00:00:00 2001 From: scala-steward Date: Sun, 10 Nov 2024 00:01:51 +0000 Subject: [PATCH 02/14] Update sbt-buildinfo to 0.13.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0c753ee38..43ba89d01 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1") addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0") From f713f7810ed7933c5bed5f5d5e0e36729954d9fd Mon Sep 17 00:00:00 2001 From: scala-steward Date: Thu, 21 Nov 2024 00:01:55 +0000 Subject: [PATCH 03/14] Update pureconfig-core to 0.17.8 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 892f2d439..61a79b34c 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,7 @@ val loggingDependencies = Seq( ) val configDependencies = Seq( - "com.github.pureconfig" %% "pureconfig-core" % "0.17.7" + "com.github.pureconfig" %% "pureconfig-core" % "0.17.8" ) val baseDependencies = Seq( From d4507f7765c976d78aaa976575b126ac464a8cb8 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Fri, 3 Jan 2025 00:01:56 +0000 Subject: [PATCH 04/14] Update jsoniter-scala-macros to 2.33.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 013f2dc7f..d8c1d373e 100644 --- a/build.sbt +++ b/build.sbt @@ -37,7 +37,7 @@ val monitoringDependencies = Seq( ) val jsonDependencies = Seq( - "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.30.15", + "com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.33.0", "com.softwaremill.sttp.tapir" %% "tapir-jsoniter-scala" % tapirVersion, "com.softwaremill.sttp.client3" %% "jsoniter" % sttpVersion ) From 38a7117661660faeb9baddd0725a638826937e16 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Mon, 6 Jan 2025 00:02:25 +0000 Subject: [PATCH 05/14] Update sbt-native-packager to 1.11.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 0c753ee38..ee45645c3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,6 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % " addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.0") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") From a7b3ea4f5c9202beaea3276f55955fb13017700a Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 00:01:53 +0000 Subject: [PATCH 06/14] Update postgresql to 42.7.5 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 013f2dc7f..26c52e9ff 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ val oxVersion = "0.3.9" val dbDependencies = Seq( "com.augustnagro" %% "magnum" % "1.3.1", - "org.postgresql" % "postgresql" % "42.7.4", + "org.postgresql" % "postgresql" % "42.7.5", "com.zaxxer" % "HikariCP" % "6.0.0", "org.flywaydb" % "flyway-database-postgresql" % "10.20.0" ) From e8eea943bd8af18e518892299cb6cf5cc8a163ad Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 00:02:02 +0000 Subject: [PATCH 07/14] Update scalafmt-core to 3.8.4 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5377845ca..7e7a0c980 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,3 +1,3 @@ -version=3.8.3 +version=3.8.4 maxColumn = 140 runner.dialect = scala3 From c2cfb5f0bcd33ebeca03dee86886605ebc677eca Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 11:13:00 +0000 Subject: [PATCH 08/14] Update macros to 2.6.4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0b4b1f32a..27dcecb71 100644 --- a/build.sbt +++ b/build.sbt @@ -62,7 +62,7 @@ val configDependencies = Seq( val baseDependencies = Seq( "com.softwaremill.ox" %% "core" % oxVersion, "com.softwaremill.quicklens" %% "quicklens" % "1.9.9", - "com.softwaremill.macwire" %% "macros" % "2.6.2" % Provided + "com.softwaremill.macwire" %% "macros" % "2.6.4" % Provided ) val apiDocsDependencies = Seq( From 3dec2c84087065aa6c61b87d86862f6b1b530366 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 11:13:47 +0000 Subject: [PATCH 09/14] Update tapir-files, tapir-jsoniter-scala, ... to 1.11.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0b4b1f32a..0fa363594 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ import complete.DefaultParsers._ val password4jVersion = "1.8.2" val sttpVersion = "3.10.1" -val tapirVersion = "1.11.6" +val tapirVersion = "1.11.12" val oxVersion = "0.5.1" val otelVersion = "1.43.0" val otelInstrumentationVersion = "2.8.0-alpha" From d1353778e0539ecd09a06701072dbdff099c1904 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 11:13:59 +0000 Subject: [PATCH 10/14] Update opentelemetry-exporter-otlp, ... to 1.46.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0b4b1f32a..9521d2f16 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ val password4jVersion = "1.8.2" val sttpVersion = "3.10.1" val tapirVersion = "1.11.6" val oxVersion = "0.5.1" -val otelVersion = "1.43.0" +val otelVersion = "1.46.0" val otelInstrumentationVersion = "2.8.0-alpha" val dbDependencies = Seq( From bf81daf1b59b9c936208f76b7d0ead362de3c6c4 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 11:14:10 +0000 Subject: [PATCH 11/14] Update scala3-library to 3.5.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0b4b1f32a..6d859d587 100644 --- a/build.sbt +++ b/build.sbt @@ -91,7 +91,7 @@ lazy val generateOpenAPIDescription = taskKey[Unit]("Generate the OpenAPI descri lazy val commonSettings = Seq( organization := "com.softwaremill.bootzooka", - scalaVersion := "3.5.0", + scalaVersion := "3.5.2", uiDirectory := (ThisBuild / baseDirectory).value / uiProjectName, updateYarn := { streams.value.log("Updating npm/yarn dependencies") From 71b492daaf43207a34c68be4065b0ad9c552de25 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 11:14:19 +0000 Subject: [PATCH 12/14] Update sbt-scalafmt to 2.5.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c1dab1f91..07acdf59c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.3") From d8572af07ff290592698febdada09627af949a87 Mon Sep 17 00:00:00 2001 From: scala-steward Date: Wed, 15 Jan 2025 11:14:28 +0000 Subject: [PATCH 13/14] Update jul-to-slf4j to 2.0.16 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 0b4b1f32a..501fe5e1b 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ val jsonDependencies = Seq( val loggingDependencies = Seq( "ch.qos.logback" % "logback-classic" % "1.5.11", - "org.slf4j" % "jul-to-slf4j" % "1.7.36", // forward e.g. otel logs which use JUL to SLF4J + "org.slf4j" % "jul-to-slf4j" % "2.0.16", // forward e.g. otel logs which use JUL to SLF4J "com.softwaremill.ox" %% "mdc-logback" % oxVersion, "org.slf4j" % "slf4j-jdk-platform-logging" % "2.0.7" % Runtime, "org.codehaus.janino" % "janino" % "3.1.12" % Runtime, From 490896aa979dd9a8f0e0e5bf7dc25a1a1d770917 Mon Sep 17 00:00:00 2001 From: adamw Date: Wed, 15 Jan 2025 12:18:07 +0100 Subject: [PATCH 14/14] Automerge --- .github/labeler.yml | 14 +++++++++++ .github/workflows/bootzooka-ci.yml | 38 ++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 .github/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 000000000..7f5cee6e0 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,14 @@ +version: 1 +labels: + - label: "automerge" + authors: ["softwaremill-ci"] + files: + - "build.sbt" + - "project/plugins.sbt" + - "project/build.properties" + - label: "dependency" + authors: ["softwaremill-ci"] + files: + - "build.sbt" + - "project/plugins.sbt" + - "project/build.properties" diff --git a/.github/workflows/bootzooka-ci.yml b/.github/workflows/bootzooka-ci.yml index dd080efb1..d3f68f296 100644 --- a/.github/workflows/bootzooka-ci.yml +++ b/.github/workflows/bootzooka-ci.yml @@ -89,3 +89,41 @@ jobs: - name: Publish docker image run: sbt backend/docker:publish + + # `automerge` label is attached iff there is exactly one file changed by steward and this file belongs to a + # whitelist specified by `labeler.yml` + label: + name: Attach automerge label + # only for PRs by softwaremill-ci + if: github.event.pull_request.user.login == 'softwaremill-ci' + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 2 + # count number of files changed + - name: Count number of files changed + id: count-changed-files + run: | + N=$(git diff --name-only -r HEAD^1 HEAD | wc -w) + echo "changed_files_num=$N" >> $GITHUB_OUTPUT + - name: Launch labeler + # skip if more than one file changed + if: steps.count-changed-files.outputs.changed_files_num == 1 + uses: srvaroa/labeler@master + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + + auto-merge: + name: Auto merge + # only for PRs by softwaremill-ci + if: github.event.pull_request.user.login == 'softwaremill-ci' + needs: [ verify, label ] + runs-on: ubuntu-24.04 + steps: + - id: automerge + name: automerge + uses: "pascalgn/automerge-action@v0.15.6" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_METHOD: "squash"