Merge branch 'master' into l8

lisadeloach63 · Sep 30, 2020 · 20c9720 · 20c9720
2 parents 953920f + 710b650
commit 20c9720
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
@@ -8,12 +8,20 @@ on:
 
 jobs:
   build:
-    runs-on: ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
+    name: PHP v${{ matrix.php }} with Mongo v${{ matrix.mongodb }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        php: ['7.3', '7.4']
-        os: ['ubuntu-latest']
-        mongodb: ['3.6', '4.0', '4.2', '4.4']
+        include:
+        - { os: ubuntu-latest, php: 7.3, mongodb: 3.6, experimental: false}
+        - { os: ubuntu-latest, php: 7.3, mongodb: '4.0', experimental: false}
+        - { os: ubuntu-latest, php: 7.3, mongodb: 4.2, experimental: false}
+        - { os: ubuntu-latest, php: 7.3, mongodb: 4.4, experimental: false}
+        - { os: ubuntu-latest, php: 7.4, mongodb: 3.6, experimental: false}
+        - { os: ubuntu-latest, php: 7.4, mongodb: '4.0', experimental: false}
+        - { os: ubuntu-latest, php: 7.4, mongodb: 4.2, experimental: false}
+        - { os: ubuntu-latest, php: 7.4, mongodb: 4.4, experimental: false}
     services:
       mongo:
         image: mongo:${{ matrix.mongodb }}
@@ -27,7 +35,6 @@ jobs:
           MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
           MYSQL_DATABASE: 'unittest'
           MYSQL_ROOT_PASSWORD:
-    name: PHP v${{ matrix.php }} with Mongo v${{ matrix.mongodb }}
 
     steps:
     - uses: actions/checkout@v2
@@ -66,4 +73,4 @@ jobs:
     - uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        fail_ci_if_error: false
+        fail_ci_if_error: false