From 254b4229023eabc84125bc203f8a66e8a65426f6 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 12 Aug 2020 22:45:33 -0400
Subject: [PATCH] Backport PR #18233: Fix cibuildwheel trigger condition.

---
 .github/workflows/cibuildwheel.yml | 41 ++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
index 10e5ea3e687a..5dd2d0dea942 100644
--- a/.github/workflows/cibuildwheel.yml
+++ b/.github/workflows/cibuildwheel.yml
@@ -1,6 +1,12 @@
 name: Build CI wheels
 
-on: [push, tags]
+on:
+  push:
+    branches:
+      - master
+      - v[0-9]+.[0-9]+.x
+    tags:
+      - v*
 
 jobs:
   build_wheels:
@@ -12,6 +18,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - uses: actions/setup-python@v2
         name: Install Python
@@ -22,17 +30,40 @@ jobs:
         run: |
           python -m pip install cibuildwheel==1.5.5
 
-      - name: Build wheels
+      - name: Build wheels for CPython
         run: |
-          python -m cibuildwheel --output-dir wheelhouse
+          python -m cibuildwheel --output-dir dist
         env:
           CIBW_BUILD: "cp3?-*"
           CIBW_SKIP: "cp35-* cp36-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
           CIBW_MANYLINUX_I686_IMAGE: manylinux1
-          CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux1
+          CIBW_BEFORE_BUILD: pip install numpy==1.15
+
+      - name: Build wheels for CPython 3.6
+        run: |
+          python -m cibuildwheel --output-dir dist
+        env:
+          CIBW_BUILD: "cp36-*"
+          CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
+          CIBW_MANYLINUX_I686_IMAGE: manylinux1
+          CIBW_BEFORE_BUILD: pip install numpy==1.15
+        if: >
+          startsWith(github.ref, 'refs/heads/v3.3') ||
+          startsWith(github.ref, 'refs/tags/v3.3')
+
+      - name: Build wheels for PyPy
+        run: |
+          python -m cibuildwheel --output-dir dist
+        env:
+          CIBW_BUILD: "pp3?-*"
+          CIBW_BEFORE_BUILD: pip install numpy==1.15
+        if: >
+          runner.os != 'Windows' && (
+          startsWith(github.ref, 'refs/heads/v3.3') ||
+          startsWith(github.ref, 'refs/tags/v3.3') )
 
       - uses: actions/upload-artifact@v2
         with:
           name: wheels
-          path: ./wheelhouse/*.whl
+          path: ./dist/*.whl