cleanup build matrix

php-http · Feb 17, 2022 · 771758b · 771758b
1 parent ba0eb54
commit 771758b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -6,6 +6,7 @@ on:
       - master
   pull_request:
 
+jobs:
   roave-bc-check:
     name: Roave BC Check
     runs-on: ubuntu-latest
@@ -15,4 +16,4 @@ on:
         uses: actions/checkout@v2
 
       - name: Roave BC Check
-        uses: "docker://nyholm/roave-bc-check-ga" 
+        uses: "docker://nyholm/roave-bc-check-ga"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,6 +2,8 @@ name: CI
 
 on:
   push:
+    branches:
+      - master
   pull_request:
 
 jobs:
@@ -25,13 +27,13 @@ jobs:
 
       - name: Install PHP 7 dependencies
         run: composer update --prefer-dist --no-interaction --no-progress
-        if: "matrix.php != '8.0'"
+        if: "startsWith(matrix.php, '7.')"
 
       - name: Install PHP 8 dependencies
         run: |
           composer require "phpdocumentor/reflection-docblock:^5.2@dev" --no-interaction --no-update
           composer update --prefer-dist --prefer-stable --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php == '8.0'"
+        if: "startsWith(matrix.php, '8.')"
 
       - name: Execute tests
         run: composer test
@@ -41,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4']
+        php: ['7.1', '7.4', '8.0']
 
     steps:
       - name: Checkout code