From 36d14b852ffab0399dda204a8f60a21c3c19000a Mon Sep 17 00:00:00 2001 From: Sebastian Utz Date: Thu, 19 Sep 2024 11:21:49 +0200 Subject: [PATCH] Fix mergify rules, reflect current workflow names (tests, docs) Additionally, add the CLA verification to the required checks --- .github/workflows/tests.yml | 2 +- .mergify.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1510d6c..63d3466 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ concurrency: jobs: test: - name: "Java: ${{ matrix.java-version }} + name: "Test Java: ${{ matrix.java-version }} CrateDB: ${{ matrix.cratedb-version }} on ${{ matrix.os }}" runs-on: ${{ matrix.os }} diff --git a/.mergify.yml b/.mergify.yml index 2335992..a0a9eec 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,18 +2,18 @@ queue_rules: - name: default conditions: - - check-success~=^Tests - - check-success~=^Build docs - - check-success~=docs/readthedocs.org + - check-success~=^Test Java + - check-success=docs/readthedocs.org:crate-jdbc + - check-success=verification/cla-signed pull_request_rules: - name: automatic merge conditions: - label=ready-to-merge - '#approved-reviews-by>=1' - - status-success~=^Tests - - status-success~=^Build docs - - status-success~=docs/readthedocs.org + - status-success~=^Test Java + - status-success=docs/readthedocs.org:crate-jdbc + - status-success=verification/cla-signed actions: queue: method: rebase