From bc6c0c71e259d2fa0ad2a528d6a72419a03ff9e3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 23 Jan 2025 10:16:36 +0100 Subject: [PATCH] chore(CI): Adjust testing matrix for Nextcloud 31 on main Signed-off-by: Joas Schilling --- .github/workflows/npm-audit-fix.yml | 2 +- .github/workflows/phpunit.yml | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 506c8e5f5..8e6f8403c 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'master', 'stable30', 'stable29', 'stable28'] + branches: ['stable31', 'stable30'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 275c1c357..76538f0cb 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,9 +20,12 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.1'] + php-versions: [ '8.1', '8.2', '8.3' ] databases: ['sqlite'] - server-versions: ['master', 'stable30'] + server-versions: ['stable31', 'stable30'] + include: + - php-versions: '8.4' + server-versions: 'stable31' name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -86,9 +89,12 @@ jobs: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.1', '8.2', '8.3'] databases: ['mysql'] - server-versions: ['master', 'stable30'] + server-versions: ['stable31', 'stable30'] + include: + - php-versions: '8.4' + server-versions: 'stable31' name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -232,4 +238,4 @@ jobs: - name : Mysql test status run: if ${{ needs.mysql.result != 'success' && needs.mysql.result != 'skipped' }}; then exit 1; fi - name : Pgsql test status - run: if ${{ needs.pgsql.result != 'success' && needs.pgsql.result != 'skipped' }}; then exit 1; fi \ No newline at end of file + run: if ${{ needs.pgsql.result != 'success' && needs.pgsql.result != 'skipped' }}; then exit 1; fi