ci: always collect and upload test results, not just on coverage runs

Signed-off-by: Spencer Murray <spencer.murray@sentry.io>

18 files changed, 25 insertions, 37 deletions

diff --git a/.github/workflows/files-external-ftp.yml b/.github/workflows/files-external-ftp.yml
index ca8013c08b9..47349b7b496 100644
--- a/.github/workflows/files-external-ftp.yml
+++ b/.github/workflows/files-external-ftp.yml
@@ -96,7 +96,8 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/FtpTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -106,7 +107,6 @@ jobs:
           flags: phpunit-files-external-ftp
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-ftp
diff --git a/.github/workflows/files-external-s3.yml b/.github/workflows/files-external-s3.yml
index 0480240a9e3..8093124cd80 100644
--- a/.github/workflows/files-external-s3.yml
+++ b/.github/workflows/files-external-s3.yml
@@ -94,7 +94,8 @@ jobs:
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/Amazons3Test.php \
           apps/files_external/tests/Storage/VersionedAmazonS3Test.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -104,7 +105,6 @@ jobs:
           flags: phpunit-files-external-s3
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-s3
@@ -167,7 +167,8 @@ jobs:
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/Amazons3Test.php \
           apps/files_external/tests/Storage/VersionedAmazonS3Test.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -177,7 +178,6 @@ jobs:
           flags: phpunit-files-external-s3
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-s3
diff --git a/.github/workflows/files-external-sftp.yml b/.github/workflows/files-external-sftp.yml
index 50905c9133d..86e6a02f899 100644
--- a/.github/workflows/files-external-sftp.yml
+++ b/.github/workflows/files-external-sftp.yml
@@ -85,7 +85,8 @@ jobs:
         run: composer run test:files_external -- \
           apps/files_external/tests/Storage/SftpTest.php \
           apps/files_external/tests/Storage/SFTP_KeyTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -95,7 +96,6 @@ jobs:
           flags: phpunit-files-external-sftp
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-sftp
diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml
index 58ccaf99b6b..04794b81984 100644
--- a/.github/workflows/files-external-smb.yml
+++ b/.github/workflows/files-external-smb.yml
@@ -90,7 +90,8 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- --verbose \
           apps/files_external/tests/Storage/SmbTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -100,7 +101,6 @@ jobs:
           flags: phpunit-files-external-smb
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-smb
diff --git a/.github/workflows/files-external-webdav.yml b/.github/workflows/files-external-webdav.yml
index a63ece73295..2c53506f8fc 100644
--- a/.github/workflows/files-external-webdav.yml
+++ b/.github/workflows/files-external-webdav.yml
@@ -87,7 +87,8 @@ jobs:
       - name: PHPUnit
         run: composer run test:files_external -- --verbose \
           apps/files_external/tests/Storage/WebdavTest.php \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -97,7 +98,6 @@ jobs:
           flags: phpunit-files-external-webdav
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-webdav
diff --git a/.github/workflows/files-external.yml b/.github/workflows/files-external.yml
index 0f8b22b1bb0..9c1de74c98a 100644
--- a/.github/workflows/files-external.yml
+++ b/.github/workflows/files-external.yml
@@ -75,7 +75,8 @@ jobs:
 
       - name: PHPUnit
         run: composer run test:files_external -- \
-          ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+          --log-junit junit.xml \
+          ${{ matrix.coverage && ' --coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -85,7 +86,6 @@ jobs:
           flags: phpunit-files-external-generic
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-files-external-generic
diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml
index 10277d1189e..74014be375d 100644
--- a/.github/workflows/node-test.yml
+++ b/.github/workflows/node-test.yml
@@ -104,7 +104,6 @@ jobs:
           files: ./coverage/lcov.info
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
 
   jsunit:
diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml
index 73df0da0ab9..3bffe7dabe1 100644
--- a/.github/workflows/object-storage-azure.yml
+++ b/.github/workflows/object-storage-azure.yml
@@ -101,7 +101,7 @@ jobs:
           OBJECT_STORE: azure
           OBJECT_STORE_KEY: nextcloud
           OBJECT_STORE_SECRET: bmV4dGNsb3Vk
-        run: composer run test -- --group PRIMARY-azure ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+        run: composer run test -- --group PRIMARY-azure --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -111,7 +111,6 @@ jobs:
           flags: phpunit-azure
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-azure
diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml
index b9d9f70c70f..6f1123f323c 100644
--- a/.github/workflows/object-storage-s3.yml
+++ b/.github/workflows/object-storage-s3.yml
@@ -107,7 +107,7 @@ jobs:
           OBJECT_STORE: s3
           OBJECT_STORE_KEY: nextcloud
           OBJECT_STORE_SECRET: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=
-        run: composer run test -- --group PRIMARY-s3 ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+        run: composer run test -- --group PRIMARY-s3 --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -117,7 +117,6 @@ jobs:
           flags: phpunit-s3
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-s3
diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml
index cce6c2b607d..bf7019acce0 100644
--- a/.github/workflows/object-storage-swift.yml
+++ b/.github/workflows/object-storage-swift.yml
@@ -97,7 +97,7 @@ jobs:
         env:
           OBJECT_STORE: swift
           OBJECT_STORE_SECRET: veryfast
-        run: composer run test -- --group PRIMARY-swift ${{ matrix.coverage && ' --coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+        run: composer run test -- --group PRIMARY-swift --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -107,7 +107,6 @@ jobs:
           flags: phpunit-swift
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-swift
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index bdee3cefb18..a949f40a522 100644
--- a/.github/workflows/phpunit-mariadb.yml
+++ b/.github/workflows/phpunit-mariadb.yml
@@ -120,7 +120,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml --log-junit junit.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -130,7 +130,6 @@ jobs:
           flags: phpunit-mariadb
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-mariadb
diff --git a/.github/workflows/phpunit-memcached.yml b/.github/workflows/phpunit-memcached.yml
index d5b2875528a..f946ed26e1b 100644
--- a/.github/workflows/phpunit-memcached.yml
+++ b/.github/workflows/phpunit-memcached.yml
@@ -97,7 +97,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit memcached tests
-        run: composer run test -- --group Memcache,Memcached ${{ matrix.coverage && '--coverage-clover ./clover.xml --log-junit junit.xml' || '' }}
+        run: composer run test -- --group Memcache,Memcached --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.xml' || '' }}
 
       - name: Upload code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -107,7 +107,6 @@ jobs:
           flags: phpunit-memcached
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-memcached
diff --git a/.github/workflows/phpunit-mysql-sharding.yml b/.github/workflows/phpunit-mysql-sharding.yml
index 7941e843158..dac057e58fe 100644
--- a/.github/workflows/phpunit-mysql-sharding.yml
+++ b/.github/workflows/phpunit-mysql-sharding.yml
@@ -155,7 +155,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml --log-junit junit.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -165,7 +165,6 @@ jobs:
           flags: phpunit-mysql
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-mysql
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
index 14ce3fd39de..7968495cdda 100644
--- a/.github/workflows/phpunit-mysql.yml
+++ b/.github/workflows/phpunit-mysql.yml
@@ -120,7 +120,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml --log-junit junit.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -130,7 +130,6 @@ jobs:
           flags: phpunit-mysql
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-mysql
diff --git a/.github/workflows/phpunit-nodb.yml b/.github/workflows/phpunit-nodb.yml
index 39e8e445066..b3148907381 100644
--- a/.github/workflows/phpunit-nodb.yml
+++ b/.github/workflows/phpunit-nodb.yml
@@ -103,7 +103,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit nodb testsuite
-        run: composer run test -- --exclude-group DB,SLOWDB ${{ matrix.coverage && ' --coverage-clover ./clover.nodb.xml --log-junit junit.xml' || '' }}
+        run: composer run test -- --exclude-group DB,SLOWDB --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.nodb.xml' || '' }}
 
       - name: Upload nodb code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -113,7 +113,6 @@ jobs:
           flags: phpunit-nodb
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-nodb
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
index cf9e0a6677f..779323e74c6 100644
--- a/.github/workflows/phpunit-oci.yml
+++ b/.github/workflows/phpunit-oci.yml
@@ -125,7 +125,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml --log-junit junit.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -135,7 +135,6 @@ jobs:
           flags: phpunit-oci
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-oci
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
index d9e8d95f5e5..476ef0bdb16 100644
--- a/.github/workflows/phpunit-pgsql.yml
+++ b/.github/workflows/phpunit-pgsql.yml
@@ -115,7 +115,7 @@ jobs:
           php -f tests/enable_all.php | grep -i -C9999 error && echo "Error during app setup" && exit 1 || exit 0
 
       - name: PHPUnit database tests
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml --log-junit junit.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -125,7 +125,6 @@ jobs:
           flags: phpunit-postgres
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-postgres
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
index b70a1665eba..444a3678768 100644
--- a/.github/workflows/phpunit-sqlite.yml
+++ b/.github/workflows/phpunit-sqlite.yml
@@ -101,7 +101,7 @@ jobs:
         run: ./occ app:list && echo "======= System config =======" && ./occ config:list system
 
       - name: PHPUnit database tests
-        run: composer run test:db ${{ matrix.coverage && ' -- --coverage-clover ./clover.db.xml --log-junit junit.xml' || '' }}
+        run: composer run test:db -- --log-junit junit.xml ${{ matrix.coverage && '--coverage-clover ./clover.db.xml' || '' }}
 
       - name: Upload db code coverage
         if: ${{ !cancelled() && matrix.coverage }}
@@ -111,7 +111,6 @@ jobs:
           flags: phpunit-sqlite
 
       - name: Upload test results
-        if: ${{ !cancelled() && matrix.coverage }}
         uses: codecov/test-results-action@v1.1.0
         with:
           flags: phpunit-sqlite