Merge branch '2.10.x' into 2.11.x

doctrine · Jul 23, 2020 · d90312f · d90312f
2 parents 8c9e92a + 93664d0
commit d90312f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -1,8 +1,7 @@
 
 name: "Continuous Integration"
 
-on:
-  pull_request:
+on: ["pull_request", "push"]
 
 jobs:
   static-analysis-phpstan:
@@ -121,6 +120,8 @@ jobs:
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -163,6 +164,8 @@ jobs:
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

diff --git a/README.md b/README.md
@@ -3,9 +3,9 @@
 | [Master][Master] | [2.10][2.10] |
 |:----------------:|:----------:|
 | [![Build status][Master image]][Master] | [![Build status][2.10 image]][2.10] |
-| [![Build Status][ContinuousPHP image]][ContinuousPHP] | [![Build Status][ContinuousPHP 2.10 image]][ContinuousPHP] |
-| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.10 image]][CodeCov 2.10] |
+| [![GitHub Actions][GA master image]][GA master] | [![GitHub Actions][GA 2.10 image]][GA 2.10] |
 | [![AppVeyor][AppVeyor master image]][AppVeyor master] | [![AppVeyor][AppVeyor 2.10 image]][AppVeyor 2.10] |
+| [![Code Coverage][Coverage image]][CodeCov Master] | [![Code Coverage][Coverage 2.10 image]][CodeCov 2.10] |
 
 Powerful database abstraction layer with many features for database schema introspection, schema management and PDO abstraction.
 
@@ -21,10 +21,14 @@ Powerful database abstraction layer with many features for database schema intro
   [CodeCov Master]: https://codecov.io/gh/doctrine/dbal/branch/master
   [AppVeyor master]: https://ci.appveyor.com/project/doctrine/dbal/branch/master
   [AppVeyor master image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/master?svg=true
+  [GA master]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3Amaster
+  [GA master image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg
 
   [2.10 image]: https://img.shields.io/travis/doctrine/dbal/2.10.x.svg?style=flat-square
   [Coverage 2.10 image]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x/graph/badge.svg
   [2.10]: https://github.com/doctrine/dbal/tree/2.10.x
   [CodeCov 2.10]: https://codecov.io/gh/doctrine/dbal/branch/2.10.x
   [AppVeyor 2.10]: https://ci.appveyor.com/project/doctrine/dbal/branch/2.10.x
   [AppVeyor 2.10 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/2.10.x?svg=true
+  [GA 2.10]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A2.10.x
+  [GA 2.10 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=2.10.x
diff --git a/ci/github/phpunit.oci8.xml b/ci/github/phpunit.oci8.xml
@@ -33,10 +33,4 @@
             <directory suffix=".php">../../lib</directory>
         </whitelist>
     </filter>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
 </phpunit>
diff --git a/ci/github/phpunit.pdo-oci.xml b/ci/github/phpunit.pdo-oci.xml
@@ -33,10 +33,4 @@
             <directory suffix=".php">../../lib</directory>
         </whitelist>
     </filter>
-
-    <groups>
-        <exclude>
-            <group>performance</group>
-        </exclude>
-    </groups>
 </phpunit>