reduce matrix and fix their name

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 194 insertions, 194 deletions

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 191f77d..8e7d825 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -18,76 +18,11 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.4']
-        databases: ['sqlite']
-        server-versions: ['master']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v2
-        with:
-          repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Checkout app
-        uses: actions/checkout@v2
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
-
-      - name: Set up Nextcloud
-        env:
-          DB_PORT: 4444
-        run: |
-          mkdir data
-          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f index.php
-          ./occ app:enable --force ${{ env.APP_NAME }}
-
-      - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests
-        run: ../vendor/bin/phpunit -c phpunit.xml
-
-  mysql:
-    runs-on: ubuntu-latest
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
         php-versions: ['7.3', '7.4', '8.0']
-        databases: ['mysql']
+        databases: ['sqlite']
         server-versions: ['master', 'stable22', 'stable21']
 
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
-
-    services:
-      mysql:
-        image: mariadb
-        ports:
-          - 4444:3306/tcp
-        env:
-          MYSQL_ROOT_PASSWORD: rootpassword
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
     steps:
       - name: Checkout server
@@ -112,74 +47,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql, gd, zip
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
-
-      - name: Set up Nextcloud
-        env:
-          DB_PORT: 4444
-        run: |
-          mkdir data
-          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
-          php -f index.php
-          ./occ app:enable --force ${{ env.APP_NAME }}
-
-      - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests
-        run: ../vendor/bin/phpunit -c phpunit.xml
-
-  pgsql:
-    runs-on: ubuntu-latest
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4']
-        databases: ['pgsql']
-        server-versions: ['master']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
-
-    services:
-      postgres:
-        image: postgres
-        ports:
-          - 4444:5432/tcp
-        env:
-          POSTGRES_USER: root
-          POSTGRES_PASSWORD: rootpassword
-          POSTGRES_DB: nextcloud
-        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v2
-        with:
-          repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Checkout app
-        uses: actions/checkout@v2
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
           coverage: none
 
       - name: Set up PHPUnit
@@ -199,62 +67,194 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}/tests
         run: ../vendor/bin/phpunit -c phpunit.xml
 
-  oci:
-    runs-on: ubuntu-latest
-
-    strategy:
-      # do not stop on another job's failure
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4']
-        databases: ['oci']
-        server-versions: ['master']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
-
-    services:
-      oracle:
-        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
-        ports:
-          - "1521:1521"
-
-    steps:
-      - name: Checkout server
-        uses: actions/checkout@v2
-        with:
-          repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-
-      - name: Checkout app
-        uses: actions/checkout@v2
-        with:
-          path: apps/${{ env.APP_NAME }}
-
-      - name: Set up php ${{ matrix.php-versions }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, iconv, fileinfo, intl, oci8
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer i
-
-      - name: Set up Nextcloud
-        run: |
-          mkdir data
-          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
-          php -f index.php
-          ./occ app:enable --force ${{ env.APP_NAME }}
-
-      - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests
-        run: ../vendor/bin/phpunit -c phpunit.xml
+#  mysql:
+#    runs-on: ubuntu-latest
+#
+#    strategy:
+#      # do not stop on another job's failure
+#      fail-fast: false
+#      matrix:
+#        php-versions: ['7.4']
+#        databases: ['mysql']
+#        server-versions: ['master']
+#
+#    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+#
+#    services:
+#      mysql:
+#        image: mariadb
+#        ports:
+#          - 4444:3306/tcp
+#        env:
+#          MYSQL_ROOT_PASSWORD: rootpassword
+#        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+#
+#    steps:
+#      - name: Checkout server
+#        uses: actions/checkout@v2
+#        with:
+#          repository: nextcloud/server
+#          ref: ${{ matrix.server-versions }}
+#
+#      - name: Checkout submodules
+#        shell: bash
+#        run: |
+#          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+#          git submodule sync --recursive
+#          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+#
+#      - name: Checkout app
+#        uses: actions/checkout@v2
+#        with:
+#          path: apps/${{ env.APP_NAME }}
+#
+#      - name: Set up php ${{ matrix.php-versions }}
+#        uses: shivammathur/setup-php@v2
+#        with:
+#          php-version: ${{ matrix.php-versions }}
+#          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql, gd, zip
+#          coverage: none
+#
+#      - name: Set up PHPUnit
+#        working-directory: apps/${{ env.APP_NAME }}
+#        run: composer i
+#
+#      - name: Set up Nextcloud
+#        env:
+#          DB_PORT: 4444
+#        run: |
+#          mkdir data
+#          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
+#          php -f index.php
+#          ./occ app:enable --force ${{ env.APP_NAME }}
+#
+#      - name: PHPUnit
+#        working-directory: apps/${{ env.APP_NAME }}/tests
+#        run: ../vendor/bin/phpunit -c phpunit.xml
+
+#  pgsql:
+#    runs-on: ubuntu-latest
+#
+#    strategy:
+#      # do not stop on another job's failure
+#      fail-fast: false
+#      matrix:
+#        php-versions: ['7.4']
+#        databases: ['pgsql']
+#        server-versions: ['master']
+#
+#    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+#
+#    services:
+#      postgres:
+#        image: postgres
+#        ports:
+#          - 4444:5432/tcp
+#        env:
+#          POSTGRES_USER: root
+#          POSTGRES_PASSWORD: rootpassword
+#          POSTGRES_DB: nextcloud
+#        options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5
+#
+#    steps:
+#      - name: Checkout server
+#        uses: actions/checkout@v2
+#        with:
+#          repository: nextcloud/server
+#          ref: ${{ matrix.server-versions }}
+#
+#      - name: Checkout submodules
+#        shell: bash
+#        run: |
+#          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+#          git submodule sync --recursive
+#          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+#
+#      - name: Checkout app
+#        uses: actions/checkout@v2
+#        with:
+#          path: apps/${{ env.APP_NAME }}
+#
+#      - name: Set up php ${{ matrix.php-versions }}
+#        uses: shivammathur/setup-php@v2
+#        with:
+#          php-version: ${{ matrix.php-versions }}
+#          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
+#          coverage: none
+#
+#      - name: Set up PHPUnit
+#        working-directory: apps/${{ env.APP_NAME }}
+#        run: composer i
+#
+#      - name: Set up Nextcloud
+#        env:
+#          DB_PORT: 4444
+#        run: |
+#          mkdir data
+#          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin
+#          php -f index.php
+#          ./occ app:enable --force ${{ env.APP_NAME }}
+#
+#      - name: PHPUnit
+#        working-directory: apps/${{ env.APP_NAME }}/tests
+#        run: ../vendor/bin/phpunit -c phpunit.xml
+#
+#  oci:
+#    runs-on: ubuntu-latest
+#
+#    strategy:
+#      # do not stop on another job's failure
+#      fail-fast: false
+#      matrix:
+#        php-versions: ['7.4']
+#        databases: ['oci']
+#        server-versions: ['master']
+#
+#    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+#
+#    services:
+#      oracle:
+#        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
+#        ports:
+#          - "1521:1521"
+#
+#    steps:
+#      - name: Checkout server
+#        uses: actions/checkout@v2
+#        with:
+#          repository: nextcloud/server
+#          ref: ${{ matrix.server-versions }}
+#
+#      - name: Checkout submodules
+#        shell: bash
+#        run: |
+#          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
+#          git submodule sync --recursive
+#          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+#
+#      - name: Checkout app
+#        uses: actions/checkout@v2
+#        with:
+#          path: apps/${{ env.APP_NAME }}
+#
+#      - name: Set up php ${{ matrix.php-versions }}
+#        uses: shivammathur/setup-php@v2
+#        with:
+#          php-version: ${{ matrix.php-versions }}
+#          extensions: mbstring, iconv, fileinfo, intl, oci8
+#          coverage: none
+#
+#      - name: Set up PHPUnit
+#        working-directory: apps/${{ env.APP_NAME }}
+#        run: composer i
+#
+#      - name: Set up Nextcloud
+#        run: |
+#          mkdir data
+#          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
+#          php -f index.php
+#          ./occ app:enable --force ${{ env.APP_NAME }}
+#
+#      - name: PHPUnit
+#        working-directory: apps/${{ env.APP_NAME }}/tests
+#        run: ../vendor/bin/phpunit -c phpunit.xml