diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-03-17 12:39:25 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-05-23 14:45:29 +0300 |
| commit | 91610d422441496c6ce77e4c13d65d056b2be65a (patch) | |
| tree | c2f5626329601645030160a17e7788fe83a1917e /.github | |
| parent | 28d61094d836f20bdc627265c7802c3bebabbd55 (diff) | |
Add PHP8.1 support
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/lint.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/test.yml | 41 |
2 files changed, 31 insertions, 14 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 91c309969..287a93430 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [7.4, 8.0] + php-versions: ['7.4', '8.0', '8.1'] name: php${{ matrix.php-versions }} lint steps: - name: Checkout @@ -41,7 +41,7 @@ jobs: - name: Set up php uses: shivammathur/setup-php@master with: - php-version: 7.4 + php-version: '8.0' coverage: none - name: Install dependencies run: composer i diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59051d6c3..e2b7d9738 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,16 +12,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [7.4] + php-versions: ['8.0'] nextcloud-versions: ['stable22', 'stable23'] include: - php-versions: 7.4 nextcloud-versions: stable24 - - php-versions: 8.0 - nextcloud-versions: stable24 - - php-versions: 7.4 - nextcloud-versions: master - - php-versions: 8.0 + - php-versions: 8.1 nextcloud-versions: master name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests steps: @@ -49,11 +45,18 @@ jobs: - name: Run tests working-directory: nextcloud/apps/mail run: composer run test:unit + if: ${{ matrix.php-versions == '8.0' }} env: XDEBUG_MODE: coverage + - name: Run tests + working-directory: nextcloud/apps/mail + run: composer run test:unit + if: ${{ matrix.php-versions != '8.0' }} + env: + XDEBUG_MODE: off - name: Report coverage uses: codecov/codecov-action@v3.1.0 - if: ${{ always() && matrix.nextcloud-versions == 'master' }} + if: ${{ always() && matrix.php-versions == '8.0' }} with: file: ./nextcloud/apps/mail/tests/clover.unit.xml flags: unittests @@ -63,9 +66,19 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: [7.4, 8.0] + php-versions: ['8.0'] nextcloud-versions: ['master'] db: ['sqlite', 'mysql', 'pgsql'] + include: + - php-versions: 7.4 + nextcloud-versions: stable22 + db: 'mysql' + - php-versions: 8.0 + nextcloud-versions: stable23 + db: 'mysql' + - php-versions: 8.1 + nextcloud-versions: stable24 + db: 'pgsql' name: php${{ matrix.php-versions }}-${{ matrix.db }} integration tests services: mail-service: @@ -138,12 +151,16 @@ jobs: echo "SET GLOBAL log_output = 'table';" | mysql -h 127.0.0.1 -u root -pmy-secret-pw - name: Run tests working-directory: nextcloud/apps/mail - run: | - ss -tunlp - true | openssl s_client -crlf -connect 127.0.0.1:993 - composer run test:integration + if: ${{ matrix.db == 'mysql' }} + run: composer run test:integration env: XDEBUG_MODE: coverage + - name: Run tests + working-directory: nextcloud/apps/mail + if: ${{ matrix.db != 'mysql' }} + run: composer run test:integration + env: + XDEBUG_MODE: off - name: Read slow queries if: ${{ always() }} run: echo "SELECT * FROM mysql.slow_log WHERE sql_text LIKE '%oc_mail%' AND sql_text NOT LIKE '%information_schema%'" | mysql -h 127.0.0.1 -u root -pmy-secret-pw |