From 5f043507b4e85a966e64578fa297e2692edd4dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Mon, 30 Nov 2020 16:28:23 +0100
Subject: [PATCH] Try using matrix include

---
 .github/workflows/ci.yml | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8bfe90b4..63a4c392 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,14 +3,6 @@ name: CI
 env:
   COMPOSE_INTERACTIVE_NO_CLI: 1
 
-php-images:
-  - "7.4":
-    - target=php:7.4-cli
-    - version=7.4
-  - "8.0":
-    - target=php:8.0.0RC5-cli
-    - version=8.0
-
 on:
   push:
     branches: [ 3.x, 2.x, master ]
@@ -23,21 +15,17 @@ jobs:
 
     strategy:
       matrix:
-        php: [
-          "7.4",
-          "8.0"
-        ]
-
-        laravel: [
-          "^6.0",
-          "^7.0",
-          "^8.0"
-        ]
+        php_version: ["7.4"] # defaults to target php:7.4-cli
+        laravel: ["^6.0", "^8.0"]
+        include:
+          - php_version: "8.0"
+          - php_target: "php:8.0.0RC5-cli"
+          - laravel: "^8.0"
 
     steps:
     - uses: actions/checkout@v2
     - name: Start docker containers
-      run: PHP_TARGET=${{ php[matrix.php].target }} PHP_VERSINON=${{ php[matrix.php].version }} docker-compose up -d
+      run: PHP_TARGET=${{ matrix.php_target }} PHP_VERSION=${{ matrix.php_version }} docker-compose up -d
     - name: Install dependencies
       run: docker-compose exec -T test composer require --no-interaction "laravel/framework:${{ matrix.laravel }}"
     - name: Run tests