Skip to content
This repository was archived by the owner on Jul 22, 2022. It is now read-only.

Commit 5bd2912

Browse files
authored
DevKit updates (#317)
1 parent 7859b8f commit 5bd2912

7 files changed

+18
-18
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Show us you choose the right branch.
88
Different branches are used for different things :
99
- 1.x is for everything backwards compatible, like patches, features and deprecation notices
10-
- master is for deprecation removals and other changes that cannot be done without a BC-break
10+
- 2.x is for deprecation removals and other changes that cannot be done without a BC-break
1111
More details here: https://github.com/sonata-project/SonataArticleBundle/blob/1.x/CONTRIBUTING.md#base-branch
1212
-->
1313
I am targeting this branch, because {reason}.

.github/workflows/documentation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
push:
99
branches:
1010
- 1.x
11-
- master
11+
- 2.x
1212
pull_request:
1313

1414
jobs:

.github/workflows/lint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
push:
99
branches:
1010
- 1.x
11-
- master
11+
- 2.x
1212
pull_request:
1313

1414
jobs:

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
push:
99
branches:
1010
- 1.x
11-
- master
11+
- 2.x
1212
pull_request:
1313

1414
jobs:

.symfony.bundle.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
branches:
66
- 1.x
7-
- master
7+
- 2.x
88

99
maintained_branches:
1010
- 1.x
11-
- master
11+
- 2.x
1212

1313
doc_dir: 'docs/'
1414

1515
current_branch: 1.x
1616

17-
dev_branch: master
17+
dev_branch: 2.x
1818

1919
# dev_branch_alias:

CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -216,19 +216,19 @@ Here is a short table resuming on which you have to start:
216216
Kind of modification | Backward Compatible (BC) | Type of release | Branch to target | Label |
217217
-------------------- | ------------------------ | --------------- | ----------------------- | ----- |
218218
Bug fixes | Yes | Patch | `1.x` | |
219-
Bug fixes | No (Only if no choice) | Major | `master` | |
219+
Bug fixes | No (Only if no choice) | Major | `2.x` | |
220220
Feature | Yes | Minor | `1.x` | |
221-
Feature | No (Only if no choice) | Major | `master` | |
221+
Feature | No (Only if no choice) | Major | `2.x` | |
222222
Deprecation | Yes (Have to) | Minor | `1.x` | |
223-
Deprecation removal | No (Can't be) | Major | `master` | |
223+
Deprecation removal | No (Can't be) | Major | `2.x` | |
224224

225225
Notes:
226226
* Branch `1.x` is the branch of the **latest stable** minor release and
227227
has to be used for Backward compatible PRs.
228228
* If you PR is not **Backward Compatible** but can be, it **MUST** be:
229229
* Changing a function/method signature? Prefer create a new one and deprecate the old one.
230230
* Code deletion? Don't. Please deprecate it instead.
231-
* If your BC PR is accepted, you can do a new one on the `master` branch which removes the deprecated code.
231+
* If your BC PR is accepted, you can do a new one on the `2.x` branch which removes the deprecated code.
232232
* SYMFONY DOC REF (same logic)?
233233

234234
If you have a non-BC PR to propose, please try to create a related BC PR first.

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Advanced article management
1919
Branch | Github Actions | Code Coverage | Documentation |
2020
------ | -------------- | ------------- | ------------- |
2121
1.x | [![Test][test_stable_badge]][test_stable_link] | [![Coverage Status][coverage_stable_badge]][coverage_stable_link] | [![Documentation Status][documentation_stable_badge]][documentation_stable_link] |
22-
master | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] |
22+
2.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] |
2323

2424
## WARNING: This repository is abandoned
2525

@@ -44,15 +44,15 @@ This package is available under the [MIT license](LICENSE).
4444

4545
[test_stable_badge]: https://github.com/sonata-project/SonataArticleBundle/workflows/Test/badge.svg?branch=1.x
4646
[test_stable_link]: https://github.com/sonata-project/SonataArticleBundle/actions?query=workflow:test+branch:1.x
47-
[test_unstable_badge]: https://github.com/sonata-project/SonataArticleBundle/workflows/Test/badge.svg?branch=master
48-
[test_unstable_link]: https://github.com/sonata-project/SonataArticleBundle/actions?query=workflow:test+branch:master
47+
[test_unstable_badge]: https://github.com/sonata-project/SonataArticleBundle/workflows/Test/badge.svg?branch=2.x
48+
[test_unstable_link]: https://github.com/sonata-project/SonataArticleBundle/actions?query=workflow:test+branch:2.x
4949

5050
[coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataArticleBundle/branch/1.x/graph/badge.svg
5151
[coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataArticleBundle/branch/1.x
52-
[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataArticleBundle/branch/master/graph/badge.svg
53-
[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataArticleBundle/branch/master
52+
[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataArticleBundle/branch/2.x/graph/badge.svg
53+
[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataArticleBundle/branch/2.x
5454

5555
[documentation_stable_badge]: https://readthedocs.org/projects/sonataarticlebundle/badge/?version=1.x
5656
[documentation_stable_link]: https://docs.sonata-project.org/projects/SonataArticleBundle/en/1.x/?badge=1.x
57-
[documentation_unstable_badge]: https://readthedocs.org/projects/sonataarticlebundle/badge/?version=master
58-
[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataArticleBundle/en/master/?badge=master
57+
[documentation_unstable_badge]: https://readthedocs.org/projects/sonataarticlebundle/badge/?version=2.x
58+
[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataArticleBundle/en/2.x/?badge=2.x

0 commit comments

Comments
 (0)