DevKit updates (#727)

sonata-project · Sep 18, 2021 · 2b03426 · 2b03426
1 parent f74e49e
commit 2b03426
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
     Show us you choose the right branch.
     Different branches are used for different things :
     - 2.x is for everything backwards compatible, like patches, features and deprecation notices
-    - master is for deprecation removals and other changes that cannot be done without a BC-break
+    - 3.x is for deprecation removals and other changes that cannot be done without a BC-break
     More details here: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/blob/2.x/CONTRIBUTING.md#base-branch
 -->
 I am targeting this branch, because {reason}.

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -8,7 +8,7 @@ on:
     push:
         branches:
             - 2.x
-            - master
+            - 3.x
     pull_request:
 
 jobs:

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -8,7 +8,7 @@ on:
     push:
         branches:
             - 2.x
-            - master
+            - 3.x
     pull_request:
 
 jobs:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,7 +8,7 @@ on:
     push:
         branches:
             - 2.x
-            - master
+            - 3.x
     pull_request:
 
 jobs:

diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml
@@ -4,16 +4,16 @@
 
 branches:
     - 2.x
-    - master
+    - 3.x
 
 maintained_branches:
     - 2.x
-    - master
+    - 3.x
 
 doc_dir: 'docs/'
 
 current_branch: 2.x
 
-dev_branch: master
+dev_branch: 3.x
 
 # dev_branch_alias:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -216,19 +216,19 @@ Here is a short table resuming on which you have to start:
 Kind of modification | Backward Compatible (BC) | Type of release | Branch to target        | Label |
 -------------------- | ------------------------ | --------------- | ----------------------- | ----- |
 Bug fixes            | Yes                      | Patch           | `2.x`   |       |
-Bug fixes            | No (Only if no choice)   | Major           | `master` |       |
+Bug fixes            | No (Only if no choice)   | Major           | `3.x` |       |
 Feature              | Yes                      | Minor           | `2.x`   |       |
-Feature              | No (Only if no choice)   | Major           | `master` |       |
+Feature              | No (Only if no choice)   | Major           | `3.x` |       |
 Deprecation          | Yes (Have to)            | Minor           | `2.x`   |       |
-Deprecation removal  | No (Can't be)            | Major           | `master` |       |
+Deprecation removal  | No (Can't be)            | Major           | `3.x` |       |
 
 Notes:
   * Branch `2.x` is the branch of the **latest stable** minor release and
   has to be used for Backward compatible PRs.
   * If you PR is not **Backward Compatible** but can be, it **MUST** be:
     * Changing a function/method signature? Prefer create a new one and deprecate the old one.
     * Code deletion? Don't. Please deprecate it instead.
-    * If your BC PR is accepted, you can do a new one on the `master` branch which removes the deprecated code.
+    * If your BC PR is accepted, you can do a new one on the `3.x` branch which removes the deprecated code.
     * SYMFONY DOC REF (same logic)?
 
 If you have a non-BC PR to propose, please try to create a related BC PR first.

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Symfony Sonata / Integrate Doctrine PHPCR into the SonataAdminBundle
 Branch | Github Actions | Code Coverage | Documentation |
 ------ | -------------- | ------------- | ------------- |
 2.x    | [![Test][test_stable_badge]][test_stable_link]     | [![Coverage Status][coverage_stable_badge]][coverage_stable_link]     | [![Documentation Status][documentation_stable_badge]][documentation_stable_link]     |
-master | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] |
+3.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] |
 
 ## WARNING: This repository is abandoned
 
@@ -44,15 +44,15 @@ This package is available under the [MIT license](LICENSE).
 
 [test_stable_badge]: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/workflows/Test/badge.svg?branch=2.x
 [test_stable_link]: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/actions?query=workflow:test+branch:2.x
-[test_unstable_badge]: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/workflows/Test/badge.svg?branch=master
-[test_unstable_link]: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/actions?query=workflow:test+branch:master
+[test_unstable_badge]: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/workflows/Test/badge.svg?branch=3.x
+[test_unstable_link]: https://github.com/sonata-project/SonataDoctrinePhpcrAdminBundle/actions?query=workflow:test+branch:3.x
 
 [coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrinePhpcrAdminBundle/branch/2.x/graph/badge.svg
 [coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataDoctrinePhpcrAdminBundle/branch/2.x
-[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrinePhpcrAdminBundle/branch/master/graph/badge.svg
-[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataDoctrinePhpcrAdminBundle/branch/master
+[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataDoctrinePhpcrAdminBundle/branch/3.x/graph/badge.svg
+[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataDoctrinePhpcrAdminBundle/branch/3.x
 
 [documentation_stable_badge]: https://readthedocs.org/projects/sonatadoctrinephpcradminbundle/badge/?version=2.x
 [documentation_stable_link]: https://docs.sonata-project.org/projects/SonataDoctrinePhpcrAdminBundle/en/2.x/?badge=2.x
-[documentation_unstable_badge]: https://readthedocs.org/projects/sonatadoctrinephpcradminbundle/badge/?version=master
-[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataDoctrinePhpcrAdminBundle/en/master/?badge=master
+[documentation_unstable_badge]: https://readthedocs.org/projects/sonatadoctrinephpcradminbundle/badge/?version=3.x
+[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataDoctrinePhpcrAdminBundle/en/3.x/?badge=3.x