From 71c5eb7f3113e9dfba7825e4b73e668d128925f2 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Sun, 8 Aug 2021 02:22:26 +0200
Subject: [PATCH] GH Actions: merge "moderate" and "modern" jobs

As there is now effectively no difference anymore between the `moderate` and `modern` jobs, these jobs can now be merged into one.
---
 .github/workflows/ci.yml | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6656a6f..fa96876 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,40 +30,13 @@ jobs:
       - name: PHPUnit tests
         run: vendor/bin/phpunit
 
-  moderate:
+  moderate-modern:
     name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
         operating-system: ['ubuntu-latest']
-        php-versions: ['7.1', '7.2', '7.3']
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, intl, sodium
-          coverage: none
-
-      - name: Modernize dependencies
-        run: composer require --dev --no-update "phpunit/phpunit:>=4"
-
-      - name: Install Composer dependencies
-        uses: "ramsey/composer-install@v1"
-
-      - name: PHPUnit tests
-        run: vendor/bin/phpunit
-
-  modern:
-    name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: ['ubuntu-latest']
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.1', '7.2', '7.3', '7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2