Skip to content

Commit a759917

Browse files
committed
Merge branch '3.6.x' into 4.0.x
* 3.6.x: Run tests with MariaDB 10.10 Prepare 3.6.0
2 parents 1295b5f + 85b98cb commit a759917

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

.doctrine-project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
{
1515
"name": "3.6",
1616
"branchName": "3.6.x",
17-
"slug": "3.6",
18-
"upcoming": true
17+
"slug": "current",
18+
"current": true,
19+
"aliases": ["stable"]
1920
},
2021
{
2122
"name": "3.5",
2223
"branchName": "3.5.x",
23-
"slug": "current",
24-
"current": true,
25-
"aliases": ["stable"]
24+
"slug": "3.5",
25+
"maintained": false
2626
},
2727
{
2828
"name": "3.4",

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,15 +278,16 @@ jobs:
278278
- "10.5"
279279
- "10.7"
280280
- "10.9"
281+
- "10.10"
281282
extension:
282283
- "mysqli"
283284
- "pdo_mysql"
284285
include:
285286
- php-version: "8.2"
286-
mariadb-version: "10.9"
287+
mariadb-version: "10.10"
287288
extension: "mysqli"
288289
- php-version: "8.2"
289-
mariadb-version: "10.9"
290+
mariadb-version: "10.10"
290291
extension: "pdo_mysql"
291292

292293
services:

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Doctrine DBAL
22

3-
| [4.0-dev][4.0] | [3.5][3.5] |
3+
| [4.0-dev][4.0] | [3.6][3.6] |
44
|:-----------------------------------------------:|:---------------------------------------------------:|
5-
| [![GitHub Actions][GA 4.0 image]][GA 4.0] | [![GitHub Actions][GA 3.5 image]][GA 3.5] |
6-
| [![AppVeyor][AppVeyor 4.0 image]][AppVeyor 4.0] | [![AppVeyor][AppVeyor 3.5 image]][AppVeyor 3.5] |
7-
| [![Code Coverage][Coverage image]][CodeCov 4.0] | [![Code Coverage][Coverage 3.5 image]][CodeCov 3.5] |
8-
| N/A | [![Code Coverage][TypeCov 3.5 image]][TypeCov 3.5] |
5+
| [![GitHub Actions][GA 4.0 image]][GA 4.0] | [![GitHub Actions][GA 3.6 image]][GA 3.6] |
6+
| [![AppVeyor][AppVeyor 4.0 image]][AppVeyor 4.0] | [![AppVeyor][AppVeyor 3.6 image]][AppVeyor 3.6] |
7+
| [![Code Coverage][Coverage image]][CodeCov 4.0] | [![Code Coverage][Coverage 3.6 image]][CodeCov 3.6] |
8+
| N/A | [![Type Coverage][TypeCov 3.6 image]][TypeCov 3.6] |
99

1010
Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features for database schema introspection and schema management.
1111

@@ -23,12 +23,12 @@ Powerful ***D***ata***B***ase ***A***bstraction ***L***ayer with many features f
2323
[GA 4.0]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A4.0.x
2424
[GA 4.0 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg
2525

26-
[Coverage 3.5 image]: https://codecov.io/gh/doctrine/dbal/branch/3.5.x/graph/badge.svg
27-
[3.5]: https://github.com/doctrine/dbal/tree/3.5.x
28-
[CodeCov 3.5]: https://codecov.io/gh/doctrine/dbal/branch/3.5.x
29-
[AppVeyor 3.5]: https://ci.appveyor.com/project/doctrine/dbal/branch/3.5.x
30-
[AppVeyor 3.5 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.5.x?svg=true
31-
[GA 3.5]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.5.x
32-
[GA 3.5 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=3.5.x
33-
[TypeCov 3.5]: https://shepherd.dev/github/doctrine/dbal
34-
[TypeCov 3.5 image]: https://shepherd.dev/github/doctrine/dbal/coverage.svg
26+
[Coverage 3.6 image]: https://codecov.io/gh/doctrine/dbal/branch/3.6.x/graph/badge.svg
27+
[3.6]: https://github.com/doctrine/dbal/tree/3.6.x
28+
[CodeCov 3.6]: https://codecov.io/gh/doctrine/dbal/branch/3.6.x
29+
[AppVeyor 3.6]: https://ci.appveyor.com/project/doctrine/dbal/branch/3.6.x
30+
[AppVeyor 3.6 image]: https://ci.appveyor.com/api/projects/status/i88kitq8qpbm0vie/branch/3.6.x?svg=true
31+
[GA 3.6]: https://github.com/doctrine/dbal/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A3.6.x
32+
[GA 3.6 image]: https://github.com/doctrine/dbal/workflows/Continuous%20Integration/badge.svg?branch=3.6.x
33+
[TypeCov 3.6]: https://shepherd.dev/github/doctrine/dbal
34+
[TypeCov 3.6 image]: https://shepherd.dev/github/doctrine/dbal/coverage.svg

0 commit comments

Comments
 (0)