Merge pull request #97 from nextcloud/update-master-target-versions

Update master target versions
nextcloud · Feb 9, 2021 · df253a7 · df253a7
2 parents 1f1f8f3 + 2294673
commit df253a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['stable21', 'master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -77,7 +77,7 @@ jobs:
       matrix:
         php-versions: ['7.3', '7.4']
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['stable21', 'master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -143,7 +143,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['pgsql']
-        server-versions: ['master']
+        server-versions: ['stable21', 'master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 
@@ -211,7 +211,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['oci']
-        server-versions: ['master']
+        server-versions: ['stable21', 'master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ php:
 #  - 7.4
 env:
   global:
-    - "CORE_BRANCH=master"
+    - "CORE_BRANCH=stable21"
     - "APP_NAME=officeonline"
   matrix:
     - "DB=mysql TEST=lint"