ci: fix Github CI config.

.github/workflows/ci.yml

@@ -23,131 +23,118 @@ jobs:
         #
         # FIXME: 'cpp' tests seems to fail due to compilation errors (numpy_pythran_unit)
         # in all python versions and test failures (builtin_float) in 3.5<
-        os: [ubuntu-18.04]
+        os: [ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11]
         backend: [c, cpp]
-        python-version: [3.8, 3.9, 3.10]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         env: [{}]
 
         include:
-          # Temporary - Allow failure on all Python -dev jobs until they are considered stable
-          #- python-version: 3.10-dev
-          #  allowed_failure: true
-
-          # Ubuntu sub-jobs:
-          # ================
-          # Most recent
-          - os: ubuntu-20.04
-            python-version: 3.9
-            backend: c
+          # Linting
           - os: ubuntu-20.04
             python-version: 3.9
-            backend: cpp
-          - os: ubuntu-20.04
-            python-version: 3.10
-            backend: c
-          - os: ubuntu-20.04
-            python-version: 3.10
-            backend: cpp
-
-          # GCC 11
-          - os: ubuntu-18.04
-            python-version: 3.9
-            backend: c
-            env: { GCC_VERSION: 11 }
-            extra_hash: "-gcc11"
-          - os: ubuntu-18.04
-            python-version: 3.9
-            backend: cpp
-            env: { GCC_VERSION: 11 }
-            extra_hash: "-gcc11"
-          # Linting
-          - os: ubuntu-18.04
-            python-version: 3.7
             backend: "c,cpp"
             env: { TEST_CODE_STYLE: 1, NO_CYTHON_COMPILE: 1 }
             extra_hash: "-codestyle"
-          # Limited API
-          - os: ubuntu-18.04
-            python-version: 3.7
-            backend: "c,cpp"
-            env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
-            extra_hash: "-limited_api"
-          - os: ubuntu-18.04
-            python-version: 3.8
-            backend: "c,cpp"
-            env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
-            extra_hash: "-limited_api"
-          # Type specs
-          - os: ubuntu-18.04
-            python-version: 3.9
-            backend: c
-            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
-            extra_hash: "-typespecs"
-          - os: ubuntu-18.04
-            python-version: 3.8
-            backend: c
-            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
-            extra_hash: "-typespecs"
-          - os: ubuntu-18.04
-            python-version: 3.7
-            backend: c
-            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
-            extra_hash: "-typespecs"
-          # Pypy
-          - os: ubuntu-18.04
-            python-version: pypy-3.7
-            backend: c
-            env: { NO_CYTHON_COMPILE: 1 }
-          # Pypy [allowed-failures] - These specifically test known bugs
-          - os: ubuntu-18.04
-            python-version: pypy-3.7
-            backend: c
-            env: { NO_CYTHON_COMPILE: 1, EXCLUDE: "--listfile=tests/pypy_bugs.txt bugs" }
-            allowed_failure: true
-            extra_hash: "-allowed_failures"
 
-          # Coverage - Disabled due to taking too long to run
-          # - os: ubuntu-18.04
-          #   python-version: 3.7
-          #   backend: "c,cpp"
-          #   env: { COVERAGE: 1 }
-          #   extra_hash: '-coverage'
+#          # Temporary - Allow failure on all Python -dev jobs until they are considered stable
+#          - python-version: "3.10"
+#            allowed_failure: true
 
-          # MacOS sub-jobs
-          # ==============
-          # (C-only builds are used to create wheels)
-          - os: macos-10.15
-            python-version: 3.7
-            backend: c
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-10.15
-            python-version: 3.8
-            backend: c
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-10.15
-            python-version: 3.9
-            backend: c
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-10.15
-            python-version: 3.9
-            backend: cpp
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-11
-            python-version: 3.7
-            backend: c
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-11
-            python-version: 3.8
-            backend: c
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-11
-            python-version: 3.9
-            backend: c
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
-          - os: macos-11
-            python-version: 3.9
-            backend: cpp
-            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          # Ubuntu sub-jobs:
+#          # ================
+#          # GCC 11
+#          - os: ubuntu-18.04
+#            python-version: 3.9
+#            backend: c
+#            env: { GCC_VERSION: 11 }
+#            extra_hash: "-gcc11"
+#          - os: ubuntu-18.04
+#            python-version: 3.9
+#            backend: cpp
+#            env: { GCC_VERSION: 11 }
+#            extra_hash: "-gcc11"
+#          # Limited API
+#          - os: ubuntu-18.04
+#            python-version: 3.7
+#            backend: "c,cpp"
+#            env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
+#            extra_hash: "-limited_api"
+#          - os: ubuntu-18.04
+#            python-version: 3.8
+#            backend: "c,cpp"
+#            env: { LIMITED_API: "--limited-api", EXCLUDE: "--no-file" }
+#            extra_hash: "-limited_api"
+#          # Type specs
+#          - os: ubuntu-18.04
+#            python-version: 3.9
+#            backend: c
+#            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
+#            extra_hash: "-typespecs"
+#          - os: ubuntu-18.04
+#            python-version: 3.8
+#            backend: c
+#            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
+#            extra_hash: "-typespecs"
+#          - os: ubuntu-18.04
+#            python-version: 3.7
+#            backend: c
+#            env: { EXTRA_CFLAGS: "-DCYTHON_USE_TYPE_SPECS=1" }
+#            extra_hash: "-typespecs"
+#          # Pypy
+#          - os: ubuntu-18.04
+#            python-version: pypy-3.7
+#            backend: c
+#            env: { NO_CYTHON_COMPILE: 1 }
+#          # Pypy [allowed-failures] - These specifically test known bugs
+#          - os: ubuntu-18.04
+#            python-version: pypy-3.7
+#            backend: c
+#            env: { NO_CYTHON_COMPILE: 1, EXCLUDE: "--listfile=tests/pypy_bugs.txt bugs" }
+#            allowed_failure: true
+#            extra_hash: "-allowed_failures"
+#
+#          # Coverage - Disabled due to taking too long to run
+#          # - os: ubuntu-18.04
+#          #   python-version: 3.7
+#          #   backend: "c,cpp"
+#          #   env: { COVERAGE: 1 }
+#          #   extra_hash: '-coverage'
+#
+#          # MacOS sub-jobs
+#          # ==============
+#          # (C-only builds are used to create wheels)
+#          - os: macos-10.15
+#            python-version: 3.7
+#            backend: c
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-10.15
+#            python-version: 3.8
+#            backend: c
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-10.15
+#            python-version: 3.9
+#            backend: c
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-10.15
+#            python-version: 3.9
+#            backend: cpp
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-11
+#            python-version: 3.7
+#            backend: c
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-11
+#            python-version: 3.8
+#            backend: c
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-11
+#            python-version: 3.9
+#            backend: c
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
+#          - os: macos-11
+#            python-version: 3.9
+#            backend: cpp
+#            env: { MACOSX_DEPLOYMENT_TARGET: 10.14 }
 
     # This defaults to 360 minutes (6h) which is way too long and if a test gets stuck, it can block other pipelines.
     # From testing, the runs tend to take ~20 minutes, so a limit of 30 minutes should be enough. This can always be