Merge pull request #727 from nextcloud/deps/nextcloud-vue

Prepare Nextcloud 27 release

.github/workflows/psalm.yml → .github/workflows/psalm-matrix.yml

@@ -5,7 +5,13 @@
 
 name: Static analysis
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+      - stable*
 
 concurrency:
   group: psalm-${{ github.head_ref || github.run_id }}
@@ -15,25 +21,30 @@ jobs:
   static-analysis:
     runs-on: ubuntu-latest
     strategy:
+      # do not stop on another job's failure
+      fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master', 'dev-stable25' ]
+        ocp-version: [ 'dev-master', 'dev-stable26', 'dev-stable25' ]
 
-    name: Nextcloud
+    name: Nextcloud ${{ matrix.ocp-version }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
 
       - name: Set up php
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           coverage: none
+          ini-file: development
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install dependencies
         run: composer i
 
       - name: Install dependencies
-        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }}
+        run: composer require --dev nextcloud/ocp:${{ matrix.ocp-version }} --ignore-platform-reqs
 
       - name: Run coding standards check
         run: composer run psalm
@@ -44,8 +55,8 @@ jobs:
 
     if: always()
 
-    name: static-analysis-summary
+    name: static-psalm-analysis-summary
 
     steps:
       - name: Summary status
-        run: if ${{ needs.static-analysis.result != 'success' && needs.static-analysis.result != 'skipped' }}; then exit 1; fi
+        run: if ${{ needs.static-analysis.result != 'success' }}; then exit 1; fi

.github/workflows/update-nextcloud-ocp.yml → .github/workflows/update-nextcloud-ocp-matrix.yml

@@ -8,7 +8,7 @@ name: Update nextcloud/ocp
 on:
   workflow_dispatch:
   schedule:
-    - cron: "5 2 * * 0"
+    - cron: '5 2 * * 0'
 
 jobs:
   update-nextcloud-ocp:
@@ -17,43 +17,55 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branches: ["master"]
-        target: ["stable25"]
+        branches: ['master']
+        target: ['stable25']
 
     name: update-nextcloud-ocp-${{ matrix.branches }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
           ref: ${{ matrix.branches }}
           submodules: true
 
-      - name: Set up php7.4
-        uses: shivammathur/setup-php@v2
+      - name: Set up php8.0
+        uses: shivammathur/setup-php@1a18b2267f80291a81ca1d33e7c851fe09e7dfc4 # v2
         with:
-          php-version: 7.4
+          php-version: 8.0
           extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
           coverage: none
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Composer install
         run: composer install
 
       - name: Composer update nextcloud/ocp
         run: composer require --dev nextcloud/ocp:dev-${{ matrix.target }}
-        continue-on-error: true
 
-      - name: Reset checkout dirs
+      - name: Reset checkout 3rdparty
         run: |
           git clean -f 3rdparty
+          git checkout 3rdparty
+        continue-on-error: true
+
+      - name: Reset checkout vendor
+        run: |
           git clean -f vendor
-          git checkout 3rdparty vendor
+          git checkout vendor
+        continue-on-error: true
+
+      - name: Reset checkout vendor-bin
+        run: |
+          git clean -f vendor-bin
+          git checkout vendor-bin
         continue-on-error: true
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@18f7dc018cc2cd597073088f7c7591b9d1c02672 # v3
         with:
           token: ${{ secrets.COMMAND_BOT_PAT }}
-          commit-message: Update nextcloud/ocp dependency
+          commit-message: "chore(dev-deps): Bump nextcloud/ocp package"
           committer: GitHub <noreply@github.com>
           author: nextcloud-command <nextcloud-command@users.noreply.github.com>
           signoff: true

.nextcloudignore

@@ -14,6 +14,7 @@ babel.config.js
 composer.json
 composer.lock
 krankerl.toml
+Makefile
 node_modules
 package.json
 package-lock.json

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 3.7.0 – 2023-05-12
+### Fixed
+- Compatibility with Nextcloud 27
+
 ## 3.6.0 – 2023-02-15
 ### Fixed
 - Compatibility with Nextcloud 26

appinfo/info.xml

@@ -4,7 +4,7 @@
 	<name>Two-Factor Authentication via Nextcloud notification</name>
 	<summary>Allows using any of your logged in devices as second factor</summary>
 	<description>Allows using any of your logged in devices as second factor</description>
-	<version>3.6.0</version>
+	<version>3.7.0</version>
 	<licence>agpl</licence>
 
 	<author>Joas Schilling</author>
@@ -24,7 +24,7 @@
 		<database>sqlite</database>
 		<database>mysql</database>
 		<database>pgsql</database>
-		<nextcloud min-version="25" max-version="26" />
+		<nextcloud min-version="25" max-version="27" />
 	</dependencies>
 
 	<background-jobs>

package.json

@@ -24,7 +24,7 @@
 		"@nextcloud/axios": "^2.3.0",
 		"@nextcloud/initial-state": "^2.0.0",
 		"@nextcloud/router": "^2.1.1",
-		"@nextcloud/vue": "^7.11.2",
+		"@nextcloud/vue": "^7.11.4",
 		"vue": "^2.7.14",
 		"vuex": "^3.6.2"
 	},