From acc509ca07618859fedc3f36be71f44ef1657931 Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 10:40:06 +0200 Subject: [PATCH 1/7] ci(mergify): configure mergify --- .gitignore | 3 ++- .mergify.yml | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .mergify.yml diff --git a/.gitignore b/.gitignore index 13da6b2..3500ab0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .gradle/ build/ .idea/ -node_modules/ \ No newline at end of file +node_modules/ +bin/ \ No newline at end of file diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..b900f8e --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,13 @@ +pull_request_rules: + - name: "Rebase on passing tests" + conditions: + - author=renovate[bot] + - check-success=test-deploy + - check-success=release + - check-success=Test: ubuntu + - check-success=Test: windows + - check-success=Test: macos + actions: + - rebase + + \ No newline at end of file From 4d87b01a4a16286b90caa2606252978dbd936a82 Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 10:45:03 +0200 Subject: [PATCH 2/7] ci(mergify): fix rebase actions --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index b900f8e..a524ecc 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,6 +8,6 @@ pull_request_rules: - check-success=Test: windows - check-success=Test: macos actions: - - rebase + rebase: \ No newline at end of file From e350a64e91947c82293f4d89925daacb69afcd8b Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 10:48:03 +0200 Subject: [PATCH 3/7] ci(mergify): update rebase conditions --- .mergify.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index a524ecc..95f19d6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,9 +4,9 @@ pull_request_rules: - author=renovate[bot] - check-success=test-deploy - check-success=release - - check-success=Test: ubuntu - - check-success=Test: windows - - check-success=Test: macos + - check-success=test: Linux + - check-success=test: Windows + - check-success=test: MacOs actions: rebase: From 20cd4c01520898f1d57bb4a7cff4902800a19ecc Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 10:50:12 +0200 Subject: [PATCH 4/7] ci(mergify): update rebase conditions --- .mergify.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 95f19d6..ead241f 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,9 +4,7 @@ pull_request_rules: - author=renovate[bot] - check-success=test-deploy - check-success=release - - check-success=test: Linux - - check-success=test: Windows - - check-success=test: MacOs + - check-success=test actions: rebase: From 97aa09d4387f97d0105c3e8d00b96d23fbfa6535 Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 11:06:33 +0200 Subject: [PATCH 5/7] ci(mergify): add success job and update rebase conditions --- .github/workflows/built_and_test.yml | 14 ++++++++++++++ .mergify.yml | 9 +++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/built_and_test.yml b/.github/workflows/built_and_test.yml index e07c018..ee27df9 100644 --- a/.github/workflows/built_and_test.yml +++ b/.github/workflows/built_and_test.yml @@ -94,3 +94,17 @@ jobs: maven-central-password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} signing-key: ${{ secrets.SIGNING_KEY }} signing-password: ${{ secrets.SIGNING_PASSWORD }} + success: + runs-on: ubuntu-22.04 + needs: + - build + - release + - test-deploy + if: >- + always() && ( + contains(join(needs.*.result, ','), 'failure') + || !contains(join(needs.*.result, ','), 'cancelled') + ) + steps: + - name: Verify that there were no failures + run: ${{ !contains(join(needs.*.result, ','), 'failure') }} diff --git a/.mergify.yml b/.mergify.yml index ead241f..cac4eb3 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -2,10 +2,11 @@ pull_request_rules: - name: "Rebase on passing tests" conditions: - author=renovate[bot] - - check-success=test-deploy - - check-success=release - - check-success=test + - check-success=success + - -draft + - -conflict actions: - rebase: + merge: + method: rebase \ No newline at end of file From 0fa2af8baafcfa22ec8cb013b73bc0b05d3bc256 Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 11:07:30 +0200 Subject: [PATCH 6/7] ci(mergify): update rebase conditions --- .mergify.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mergify.yml b/.mergify.yml index cac4eb3..44676aa 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -3,6 +3,8 @@ pull_request_rules: conditions: - author=renovate[bot] - check-success=success + - check-skipped=success + - check-cancelled=success - -draft - -conflict actions: From 96cfda55212d20cc54afe294d963e6109add3685 Mon Sep 17 00:00:00 2001 From: Kelvin Olaiya Date: Sat, 12 Aug 2023 11:09:44 +0200 Subject: [PATCH 7/7] ci(mergify): update rebase conditions --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 44676aa..b5fedcd 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -4,7 +4,7 @@ pull_request_rules: - author=renovate[bot] - check-success=success - check-skipped=success - - check-cancelled=success + - check-neutral=success - -draft - -conflict actions: