From 874cf81df61f49e043d8e19600d17ecafec7fd5f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 4 Apr 2022 09:55:55 +0200 Subject: [PATCH 1/3] Update master php testing versions Signed-off-by: Joas Schilling --- .github/workflows/lint.yml | 2 +- .github/workflows/phpunit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 3d32e676..58748207 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: - php-versions: ['7.2', '7.3', '7.4'] + php-versions: ['7.2', '7.3', '7.4', "8.0", "8.1"] name: php${{ matrix.php-versions }} steps: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index cf64cccf..67c11d42 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -79,7 +79,7 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['7.3', '7.4'] + php-versions: ['7.3', '7.4', "8.0", "8.1"] databases: ['mysql'] server-versions: ['stable22', 'stable23', 'master'] From 4325fbd494387bd804dac24a3afb3b6dcacf78c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 4 Apr 2022 14:16:00 +0200 Subject: [PATCH 2/3] Use setup-php@v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet --- .github/workflows/lint.yml | 2 +- .github/workflows/phpunit.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 58748207..8d5fcea5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} coverage: none diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 67c11d42..e50edf24 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -44,7 +44,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit @@ -114,7 +114,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit @@ -186,7 +186,7 @@ jobs: path: apps/${{ env.APP_NAME }} - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php-versions }} tools: phpunit From 27b151a9c12dc039a7e19abc2a979312a00f9c55 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 4 Apr 2022 14:28:13 +0200 Subject: [PATCH 3/3] Fix matrix Signed-off-by: Joas Schilling --- .github/workflows/phpunit.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index e50edf24..6098ea07 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -79,9 +79,19 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['7.3', '7.4', "8.0", "8.1"] + php-versions: ['7.4', "8.0"] databases: ['mysql'] server-versions: ['stable22', 'stable23', 'master'] + include: + - php-versions: '7.3' + server-versions: 'stable22' + databases: 'mysql' + - php-versions: '7.3' + server-versions: 'stable23' + databases: 'mysql' + - php-versions: '8.1' + server-versions: 'master' + databases: 'mysql' name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}