From 5210a51571834d584c877b0f0e9f025f59af95d0 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Mon, 22 Apr 2024 08:40:32 +0330 Subject: [PATCH] Added mergify --- .github/workflows/ci.yml | 15 ++++++++++++++- .mergify.yml | 12 ++++++++++++ build.sbt | 15 ++++++++++++++- 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .mergify.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8079db4..beea5e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: matrix: os: - ubuntu-20.04 - - ubuntu-22.04 + - ubuntu-latest - macos-11 - macos-12 - windows-2022 @@ -222,3 +222,16 @@ jobs: - name: Publish run: sbt '++ ${{ matrix.scala }}' tlRelease + + post-build: + name: post build + needs: [build] + strategy: + matrix: + os: [ubuntu-latest] + scala: [] + java: [] + runs-on: ${{ matrix.os }} + steps: + - name: post build + run: echo success! diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..884eccf --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,12 @@ +pull_request_rules: + - name: Automatic merge for dependency updates + conditions: + - "head~=update/" + - "status-success=post build (ubuntu-latest)" + + - or: + - "author=hnaderi" + - "author=scala-steward" + actions: + merge: + method: squash diff --git a/build.sbt b/build.sbt index 57c0258..897f80c 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,20 @@ val Scala213 = "2.13.12" ThisBuild / crossScalaVersions := Seq(Scala213, "3.3.3") ThisBuild / scalaVersion := Scala213 ThisBuild / githubWorkflowOSes := - Seq("ubuntu-20.04", "ubuntu-22.04", "macos-11", "macos-12", "windows-2022") + Seq("ubuntu-20.04", "ubuntu-latest", "macos-11", "macos-12", "windows-2022") +ThisBuild / githubWorkflowAddedJobs += WorkflowJob( + id = "post-build", + name = "post build", + needs = List("build"), + steps = List( + WorkflowStep.Run( + commands = List("echo success!"), + name = Some("post build") + ) + ), + scalas = Nil, + javas = Nil +) lazy val root = tlCrossRootProject.aggregate(lib, example)