From 73ec5baa667382b6f412f527cb9b7d312282985a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Sun, 11 Oct 2020 19:51:26 +0200
Subject: [PATCH 1/2] Update phpunit.yml

---
 .github/workflows/phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 30a92f74..399c84e4 100644
--- 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: ${{ github.base_ref }}
   
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
 

From b697fbc2dbe55cabe7458b9c0f1f1676599ccc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Sun, 11 Oct 2020 19:52:45 +0200
Subject: [PATCH 2/2] Update phpunit.yml

---
 .github/workflows/phpunit.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 399c84e4..56270b05 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -20,16 +20,15 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite']
-        server-versions: ${{ github.base_ref }}
   
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
     steps:
       - name: Checkout server
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
+          ref: ${{ github.base_ref }}
 
       - name: Checkout submodules
         shell: bash
@@ -80,9 +79,8 @@ jobs:
       matrix:
         php-versions: ['7.2', '7.3', '7.4']
         databases: ['mysql']
-        server-versions: ['master']
   
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
     services:
       mysql:
@@ -98,7 +96,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
+          ref: ${{ github.base_ref }}
 
       - name: Checkout submodules
         shell: bash
@@ -150,9 +148,8 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['pgsql']
-        server-versions: ['master']
   
-    name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
+    name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
     services:
       postgres:
@@ -170,7 +167,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: nextcloud/server
-          ref: ${{ matrix.server-versions }}
+          ref: ${{ github.base_ref }}
 
       - name: Checkout submodules
         shell: bash