Update to nc25

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

5 files changed, 10 insertions, 110 deletions

diff --git a/.github/workflows/floccus.yml b/.github/workflows/floccus.yml
index df4d2f41..980834a9 100644
--- a/.github/workflows/floccus.yml
+++ b/.github/workflows/floccus.yml
@@ -31,7 +31,7 @@ jobs:
         floccus-ref: ['master', 'develop']
         node-versions: [14.x]
         npm-versions: [7.x]
-        server-versions: ['22']
+        server-versions: ['24']
         selenium-version: ['3']
         floccus-adapter:
           - nextcloud-bookmarks
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 16670f0d..7230c42f 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite']
-        server-versions: ['stable22']
+        server-versions: ['stable25']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} + codecov
 
@@ -87,7 +87,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable22', 'stable23', 'stable24']
+        server-versions: ['stable22', 'stable23', 'stable24', 'stable25']
         include:
           - server-versions: stable24
             databases: 'mysql'
diff --git a/.github/workflows/repair.yml b/.github/workflows/repair.yml
index d4eb38d0..8e98ad2d 100644
--- a/.github/workflows/repair.yml
+++ b/.github/workflows/repair.yml
@@ -23,111 +23,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable22', 'stable23', 'stable24']
-
-    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
-
-  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']
+        server-versions: ['stable22', 'stable23', 'stable24', 'stable25']
 
     name: Repair step on ${{ matrix.databases }}-${{ matrix.server-versions }}
 
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
index 96781b8d..85a8583f 100644
--- a/.github/workflows/upgrade.yml
+++ b/.github/workflows/upgrade.yml
@@ -23,11 +23,15 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite', 'mysql', 'pgsql']
-        server-versions: ['stable22', 'stable23', 'stable24']
+        server-versions: ['stable22', 'stable23', 'stable24', 'stable25']
         prev-version: ['stable', 'stable10', 'stable4']
         exclude:
           - prev-version: stable4
             server-versions: stable24
+          - prev-version: stable4
+            server-versions: stable25
+          - prev-version: stable10
+            server-versions: stable25
 
     name: Update from ${{ matrix.prev-version }} on ${{ matrix.databases }}-${{ matrix.server-versions }}
 
diff --git a/appinfo/info.xml b/appinfo/info.xml
index ec3faf5b..21a4c463 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -42,7 +42,7 @@ Requirements:
 		<database>pgsql</database>
 		<lib>intl</lib>
 		<lib>mbstring</lib>
-		<nextcloud min-version="22" max-version="24" />
+		<nextcloud min-version="22" max-version="25" />
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Bookmarks\BackgroundJobs\CrawlJob</job>