From 6f429e1141dba2f7ed85df5f6fd3ae19a808861b Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 23 Sep 2020 00:11:37 +0300 Subject: [PATCH 1/3] Add Mergify config --- .github/mergify.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/mergify.yml diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 000000000..f0648b8c3 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,50 @@ +pull_request_rules: + - name: Automatic merge + conditions: + - "#approved-reviews-by>=1" + - label=automerge + - status-success=Lint + - status-success=continuous-integration/appveyor/pr + - status-success=continuous-integration/travis-ci/pr + + # Test + - status-success=macOS-latest Python 3.6 + - status-success=macOS-latest Python 3.7 + - status-success=macOS-latest Python 3.8 + - status-success=macOS-latest Python 3.9-dev + - status-success=macOS-latest Python pypy3 + - status-success=ubuntu-latest Python 3.6 + - status-success=ubuntu-latest Python 3.7 + - status-success=ubuntu-latest Python 3.8 + - status-success=ubuntu-latest Python 3.9-dev + - status-success=ubuntu-latest Python pypy3 + + # Test Docker + - status-success=alpine + - status-success=amazon-1-amd64 + - status-success=amazon-2-amd64 + - status-success=arch + - status-success=centos-6-amd64 + - status-success=centos-7-amd64 + - status-success=centos-8-amd64 + - status-success=debian-10-buster-x86 + - status-success=fedora-31-amd64 + - status-success=fedora-32-amd64 + - status-success=ubuntu-18.04-bionic-amd64 + - status-success=ubuntu-20.04-focal-amd64 + + # Test Windows + - status-success=MSYS2 MinGW 32-bit + - status-success=MSYS2 MinGW 64-bit + - status-success=Python 3.6 x64 + - status-success=Python 3.6 x86 + - status-success=Python 3.7 x64 + - status-success=Python 3.7 x86 + - status-success=Python 3.8 x64 + - status-success=Python 3.8 x86 + - status-success=Python 3.9-dev x64 + - status-success=Python 3.9-dev x86 + - status-success=Python pypy3 x86 + actions: + merge: + method: merge From 7d829ca5323889b859bd9625773960fcf9ab468d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Wed, 23 Sep 2020 10:53:47 +0300 Subject: [PATCH 2/3] Use dependant jobs to signal success for Mergify --- .github/mergify.yml | 42 +++--------------------------------------- 1 file changed, 3 insertions(+), 39 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index f0648b8c3..3683bc483 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -4,47 +4,11 @@ pull_request_rules: - "#approved-reviews-by>=1" - label=automerge - status-success=Lint + - status-success=Test Successful + - status-success=Docker Test Successful + - status-success=Windows Test Successful - status-success=continuous-integration/appveyor/pr - status-success=continuous-integration/travis-ci/pr - - # Test - - status-success=macOS-latest Python 3.6 - - status-success=macOS-latest Python 3.7 - - status-success=macOS-latest Python 3.8 - - status-success=macOS-latest Python 3.9-dev - - status-success=macOS-latest Python pypy3 - - status-success=ubuntu-latest Python 3.6 - - status-success=ubuntu-latest Python 3.7 - - status-success=ubuntu-latest Python 3.8 - - status-success=ubuntu-latest Python 3.9-dev - - status-success=ubuntu-latest Python pypy3 - - # Test Docker - - status-success=alpine - - status-success=amazon-1-amd64 - - status-success=amazon-2-amd64 - - status-success=arch - - status-success=centos-6-amd64 - - status-success=centos-7-amd64 - - status-success=centos-8-amd64 - - status-success=debian-10-buster-x86 - - status-success=fedora-31-amd64 - - status-success=fedora-32-amd64 - - status-success=ubuntu-18.04-bionic-amd64 - - status-success=ubuntu-20.04-focal-amd64 - - # Test Windows - - status-success=MSYS2 MinGW 32-bit - - status-success=MSYS2 MinGW 64-bit - - status-success=Python 3.6 x64 - - status-success=Python 3.6 x86 - - status-success=Python 3.7 x64 - - status-success=Python 3.7 x86 - - status-success=Python 3.8 x64 - - status-success=Python 3.8 x86 - - status-success=Python 3.9-dev x64 - - status-success=Python 3.9-dev x86 - - status-success=Python pypy3 x86 actions: merge: method: merge From 43649846cfa44677298bfe87abc56a0f482e4f30 Mon Sep 17 00:00:00 2001 From: nulano Date: Wed, 23 Sep 2020 08:56:17 +0200 Subject: [PATCH 3/3] add all successful report jobs (cherry picked from commit 0158d752f17439e560ba58adb5dfc07765a106d7) --- .github/workflows/test-docker.yml | 8 ++++++++ .github/workflows/test-windows.yml | 8 ++++++++ .github/workflows/test.yml | 8 ++++++++ 3 files changed, 24 insertions(+) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 9025dec1c..322244b12 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -61,3 +61,11 @@ jobs: with: flags: GHA_Docker name: ${{ matrix.docker }} + + success: + needs: build + runs-on: ubuntu-latest + name: Docker Test Successful + steps: + - name: Success + run: echo Docker Test Successful diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 2371bf68c..6cae15c66 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -267,3 +267,11 @@ jobs: bash <(curl -s https://codecov.io/bash) -F GHA_Windows env: CODECOV_NAME: ${{ matrix.name }} + + success: + needs: [build, msys] + runs-on: ubuntu-latest + name: Windows Test Successful + steps: + - name: Success + run: echo Windows Test Successful diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dbe0eb822..3f6f2ac51 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,3 +107,11 @@ jobs: run: bash <(curl -s https://codecov.io/bash) -F ${{ matrix.codecov-flag }} env: CODECOV_NAME: ${{ matrix.os }} Python ${{ matrix.python-version }} + + success: + needs: build + runs-on: ubuntu-latest + name: Test Successful + steps: + - name: Success + run: echo Test Successful