CI: Test with nextcloud 24

.github/workflows/floccus.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - master
-      - develop
+      - stable*
 
 env:
   APP_NAME: bookmarks

.github/workflows/phpunit.yml

@@ -11,7 +11,7 @@ env:
   APP_NAME: bookmarks
 
 jobs:
-  php:
+  codecov:
     runs-on: ubuntu-latest
 
     strategy:
@@ -75,16 +75,25 @@ jobs:
           root_dir: ./apps/${{ env.APP_NAME }}/
           verbose: true
 
-  mysql:
+  php:
     runs-on: ubuntu-latest
 
     strategy:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4']
-        databases: ['mysql']
-        server-versions: ['stable20']
+        php-versions: ['7.3', '7.4', '8.0']
+        databases: ['sqlite', 'mysql', 'pgsql']
+        server-versions: ['stable20', 'stable21', 'stable22', 'stable23', 'v24.0.0beta2']
+        exclude:
+          - server-versions: stable20
+            php-versions: '8.0'
+          - server-versions: v24.0.0beta2
+            php-versions: '7.3'
+        include:
+          - server-versions: v24.0.0beta2
+            databases: 'mysql'
+            php-versions: '8.1'
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -96,73 +105,15 @@ jobs:
         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 }}
-          tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql, gd, zip
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer install --ignore-platform-req=php
-
-      - name: Set up Nextcloud
-        env:
-          DB_PORT: 4444
-        run: |
-          sleep 25
-          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 password
-          ./occ app:enable ${{ env.APP_NAME }}
-          php -S localhost:8080 &
-
-      - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
-
-  mysql_nc21:
-    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']
-        server-versions: ['stable21']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
-
-    services:
-      mysql:
-        image: mariadb:10.5
+      postgres:
+        image: postgres
         ports:
-          - 4444:3306/tcp
+          - 4445:5432/tcp
         env:
-          MYSQL_ROOT_PASSWORD: rootpassword
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+          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
@@ -195,7 +146,8 @@ jobs:
         working-directory: apps/${{ env.APP_NAME }}
         run: composer install --ignore-platform-req=php
 
-      - name: Set up Nextcloud
+      - name: Set up Nextcloud with mysql
+        if: ${{matrix.databases == 'mysql' }}
         env:
           DB_PORT: 4444
         run: |
@@ -205,69 +157,12 @@ jobs:
           ./occ app:enable ${{ env.APP_NAME }}
           php -S localhost:8080 &
 
-      - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: ./vendor/phpunit/phpunit/phpunit -c tests/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: ['stable20', 'stable21', 'stable22', 'stable23']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
-
-    services:
-      postgres:
-        image: postgres
-        ports:
-          - 4444:5432/tcp
+      - name: Set up Nextcloud with pgsql/sqlite
+        if: ${{matrix.databases != 'mysql' }}
         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 }}
-          tools: phpunit
-          extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql, gd, zip
-          coverage: none
-
-      - name: Set up PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}
-        run: composer install --ignore-platform-req=php
-
-      - name: Set up Nextcloud
-        env:
-          DB_PORT: 4444
+          DB_PORT: 4445
         run: |
+          sleep 25
           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 password
           ./occ app:enable ${{ env.APP_NAME }}

.github/workflows/psalm.yml

@@ -13,8 +13,11 @@ jobs:
 
     strategy:
       matrix:
-        ocp-version: [ 'v20.0.7' ]
-        php-version: [  '7.4' ]
+        ocp-version: [ 'v20.0.7', 'v21.0.0', 'v22.1.1', 'v23.0.2']
+        php-version: [ '7.4' ]
+        include:
+          - ocp-version: 'v23.0.2'
+            php-version: '8.0'
 
     name: Nextcloud ${{ matrix.ocp-version }}
 
@@ -36,33 +39,3 @@ jobs:
 
       - name: Run coding standards check
         run: composer run psalm
-
-  static-psalm-analysis-21:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ocp-version: [ 'v21.0.0', 'v22.1.1', 'v23.0.2' ]
-        php-version: [  '7.4', '8.0' ]
-
-    name: Nextcloud ${{ matrix.ocp-version }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-
-      - name: Set up php
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --ignore-platform-req=php
-
-      - name: Install dependencies
-        run: composer require --dev christophwurst/nextcloud:${{ matrix.ocp-version }}
-
-      - name: Run coding standards check
-        run: composer run psalm

.github/workflows/repair.yml

@@ -3,6 +3,9 @@ name: Repair step
 on:
   pull_request:
   push:
+    branches:
+      - master
+      - stable*
 
 env:
   APP_NAME: bookmarks
@@ -111,3 +114,107 @@ jobs:
       - name: Compare exports
         run: |
           diff export.html export2.html
+
+  nc24:
+    runs-on: ubuntu-latest
+
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4']
+        databases: ['sqlite', 'mysql', 'pgsql']
+        server-versions: ['v24.0.0beta2']
+
+    name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }}
+
+    env:
+      MYSQL_PORT: 4444
+      PGSQL_PORT: 4445
+
+    services:
+      mysql:
+        image: mariadb:10.5
+        ports:
+          - 4444:3306/tcp
+        env:
+          MYSQL_ROOT_PASSWORD: rootpassword
+        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+      postgres:
+        image: postgres
+        ports:
+          - 4445: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: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: phpunit
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_mysql, pdo_sqlite, pgsql, pdo_pgsql, gd, zip
+
+      - name: Checkout app
+        uses: actions/checkout@v2
+        with:
+          path: apps/${{ env.APP_NAME }}
+
+      - name: Install app
+        working-directory: apps/${{ env.APP_NAME }}
+        run: composer install --ignore-platform-req=php --no-dev
+
+      - name: Set up Nextcloud and install app
+        if: ${{ matrix.databases != 'pgsql'}}
+        run: |
+          sleep 25
+          mkdir data
+          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$MYSQL_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
+          ./occ app:enable -vvv -f ${{ env.APP_NAME }}
+          php -S localhost:8080 &
+
+      - name: Set up Nextcloud and install app
+        if: ${{ matrix.databases == 'pgsql'}}
+        run: |
+          sleep 25
+          mkdir data
+          ./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$PGSQL_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
+          ./occ app:enable -vvv -f ${{ env.APP_NAME }}
+          php -S localhost:8080 &
+
+      - name: Import bookmarks
+        run: |
+          cp ./apps/bookmarks/tests/res/import.file ./apps/bookmarks/tests/res/import.html
+          curl -u 'admin:password' -vvv --fail -F 'bm_import=@./apps/bookmarks/tests/res/import.html' http://localhost:8080/index.php/apps/bookmarks/public/rest/v2/folder/-1/import
+
+      - name: Export bookmarks
+        run: |
+          curl -u 'admin:password' -vvv --fail "http://localhost:8080/index.php/apps/bookmarks/public/rest/v2/bookmark/export" > export.html
+
+      - name: Run update
+        run: |
+          ./occ maintenance:repair
+
+      - name: Export bookmarks
+        run: |
+          curl -u 'admin:password' -vvv --fail "http://localhost:8080/index.php/apps/bookmarks/public/rest/v2/bookmark/export" > export2.html
+
+      - name: Compare exports
+        run: |
+          diff export.html export2.html