Merge pull request #1265 from nextcloud/update-stable25-target-versions

Adjust testing matrix for Nextcloud 25 on stable25
nextcloud · Sep 22, 2022 · 8e344ac · 8e344ac
2 parents c5153dc + 0f002bc
commit 8e344ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-stable22', 'dev-stable23', 'dev-stable24', 'dev-master' ]
+        ocp-version: [ 'dev-stable25' ]
 
     name: Nextcloud ${{ matrix.ocp-version }}
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,15 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         php-version: [ "8.1" ]
-        nextcloud-version: [ 'master', 'stable24' ]
+        nextcloud-version: [ 'stable25' ]
         db: ['sqlite']
-        include:
-          - php-version: "8.0"
-            nextcloud-version: stable23
-            db: sqlite
-          - php-version: "7.4"
-            nextcloud-version: stable22
-            db: sqlite
 
     name: Nextcloud ${{ matrix.nextcloud-version }} php${{ matrix.php-version }} unit tests
     steps:
@@ -69,22 +62,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version: [ "8.1" ]
-        nextcloud-version: [ 'master' ]
+        nextcloud-version: [ 'stable25' ]
         browser: [ 'firefox' ]
         db: [ 'mysql' ]
-        include:
-          - php-version: "8.1"
-            nextcloud-version: "stable24"
-            browser: 'chrome'
-            db: 'sqlite'
-          - php-version: "8.0"
-            nextcloud-version: "stable23"
-            browser: 'firefox'
-            db: 'pgsql'
-          - php-version: "7.4"
-            nextcloud-version: "stable22"
-            browser: 'chrome'
-            db: 'mysql'
 
     name: Nextcloud ${{ matrix.nextcloud-version }} acceptance tests on php${{ matrix.php-version }}/${{ matrix.browser }}/${{ matrix.db }}
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -17,8 +17,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_totp/dd1e48deec73a250886f35f3924186f5357f4c5f/screenshots/enter_challenge.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/twofactor_totp/dd1e48deec73a250886f35f3924186f5357f4c5f/screenshots/settings.png</screenshot>
 	<dependencies>
-		<php min-version="7.4" max-version="8.1" />
-		<nextcloud min-version="22" max-version="25" />
+		<nextcloud min-version="25" max-version="25" />
 	</dependencies>
 	<two-factor-providers>
 		<provider>OCA\TwoFactorTOTP\Provider\TotpProvider</provider>