From e13fe7c2da993ff41624bdaebec1e14a1e69ccc4 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 19 Apr 2022 20:06:28 +0200 Subject: [PATCH] Use new "Ready To Merge" approach for GHA --- .github/workflows/build-test.yml | 6 ++++++ .mergify.yml | 14 ++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index a828aa7..75229bc 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -21,3 +21,9 @@ jobs: scala: >- [ "2.12.15", "2.13.8" ] cmd: sbt ++$SCALA_VERSION test + + finish: + name: Finish + needs: # Should be last + - "tests" + uses: playframework/.github/.github/workflows/rtm.yml@v1 diff --git a/.mergify.yml b/.mergify.yml index eb852e3..646d7e8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,22 +2,12 @@ queue_rules: - name: default conditions: # Conditions to get out of the queue (= merged) - - check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 17$ - - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 17$ - - check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 11$ - - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 11$ - - check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 8$ - - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 8$ + - check-success~=/ Ready To Merge$ pull_request_rules: - name: Merge PRs that are ready conditions: - - check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 17$ - - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 17$ - - check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 11$ - - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 11$ - - check-success~=^Tests / Scala 2\.12\.(\d+) & JDK 8$ - - check-success~=^Tests / Scala 2\.13\.(\d+) & JDK 8$ + - check-success~=/ Ready To Merge$ - check-success=typesafe-cla-validator - "#approved-reviews-by>=1" - "#review-requested=0"