Skip to content

Commit 716fc97

Browse files
derrabusderrabus
committed
Merge branch '2.19.x' into 3.1.x
* 2.19.x: Prepare releases 2.19 and 3.1 (#11335)
2 parents 4617a5e + a809a71 commit 716fc97

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

‎.doctrine-project.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,41 @@
1111
"slug": "latest",
1212
"upcoming": true
1313
},
14+
{
15+
"name": "3.2",
16+
"branchName": "3.2.x",
17+
"slug": "3.2",
18+
"upcoming": true
19+
},
1420
{
1521
"name": "3.1",
1622
"branchName": "3.1.x",
1723
"slug": "3.1",
18-
"upcoming": true
24+
"current": true
1925
},
2026
{
2127
"name": "3.0",
2228
"branchName": "3.0.x",
2329
"slug": "3.0",
24-
"current": true
30+
"maintained": false
31+
},
32+
{
33+
"name": "2.20",
34+
"branchName": "2.20.x",
35+
"slug": "2.20",
36+
"upcoming": true
2537
},
2638
{
2739
"name": "2.19",
2840
"branchName": "2.19.x",
2941
"slug": "2.19",
30-
"upcoming": true
42+
"maintained": true
3143
},
3244
{
3345
"name": "2.18",
3446
"branchName": "2.18.x",
3547
"slug": "2.18",
36-
"maintained": true
48+
"maintained": false
3749
},
3850
{
3951
"name": "2.17",

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
| [4.0.x][4.0] | [3.1.x][3.1] | [3.0.x][3.0] | [2.19.x][2.19] | [2.18.x][2.18] |
2-
|:------------------------------------------------------:|:------------------------------------------------------:|:-------------------------------------------------------:|:--------------------------------------------------------:|:---------------------------------------------------------:|
3-
| [![Build status][4.0 image]][4.0] | [![Build status][3.1 image]][3.1] | [![Build status][3.0 image]][3.0] | [![Build status][2.19 image]][2.19] | [![Build status][2.18 image]][2.18] |
4-
| [![Coverage Status][4.0 coverage image]][4.0 coverage] | [![Coverage Status][3.1 coverage image]][3.1 coverage] | [![Coverage Status][3.0 coverage image]][3.0 coverage] | [![Coverage Status][2.19 coverage image]][2.19 coverage] | [![Coverage Status][2.18 coverage image]][2.18 coverage] |
1+
| [4.0.x][4.0] | [3.2.x][3.2] | [3.1.x][3.1] | [2.20.x][2.20] | [2.19.x][2.19] |
2+
|:------------------------------------------------------:|:------------------------------------------------------:|:------------------------------------------------------:|:--------------------------------------------------------:|:--------------------------------------------------------:|
3+
| [![Build status][4.0 image]][4.0] | [![Build status][3.2 image]][3.2] | [![Build status][3.1 image]][3.1] | [![Build status][2.20 image]][2.20] | [![Build status][2.19 image]][2.19] |
4+
| [![Coverage Status][4.0 coverage image]][4.0 coverage] | [![Coverage Status][3.2 coverage image]][3.2 coverage] | [![Coverage Status][3.1 coverage image]][3.1 coverage] | [![Coverage Status][2.20 coverage image]][2.20 coverage] | [![Coverage Status][2.19 coverage image]][2.19 coverage] |
55

66
[<h1 align="center">🇺🇦 UKRAINE NEEDS YOUR HELP NOW!</h1>](https://www.doctrine-project.org/stop-war.html)
77

@@ -22,19 +22,19 @@ without requiring unnecessary code duplication.
2222
[4.0]: https://github.com/doctrine/orm/tree/4.0.x
2323
[4.0 coverage image]: https://codecov.io/gh/doctrine/orm/branch/4.0.x/graph/badge.svg
2424
[4.0 coverage]: https://codecov.io/gh/doctrine/orm/branch/4.0.x
25+
[3.2 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=3.2.x
26+
[3.2]: https://github.com/doctrine/orm/tree/3.2.x
27+
[3.2 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.2.x/graph/badge.svg
28+
[3.2 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.2.x
2529
[3.1 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=3.1.x
2630
[3.1]: https://github.com/doctrine/orm/tree/3.1.x
2731
[3.1 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.1.x/graph/badge.svg
2832
[3.1 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.1.x
29-
[3.0 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=3.0.x
30-
[3.0]: https://github.com/doctrine/orm/tree/3.0.x
31-
[3.0 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.0.x/graph/badge.svg
32-
[3.0 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.0.x
33+
[2.20 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.20.x
34+
[2.20]: https://github.com/doctrine/orm/tree/2.20.x
35+
[2.20 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.20.x/graph/badge.svg
36+
[2.20 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.20.x
3337
[2.19 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.19.x
3438
[2.19]: https://github.com/doctrine/orm/tree/2.19.x
3539
[2.19 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.19.x/graph/badge.svg
3640
[2.19 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.19.x
37-
[2.18 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.18.x
38-
[2.18]: https://github.com/doctrine/orm/tree/2.18.x
39-
[2.18 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.18.x/graph/badge.svg
40-
[2.18 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.18.x

0 commit comments

Comments
 (0)