diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index aa2a7e4..30bc818 100644 --- 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 : - 3.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 + - 4.x is for deprecation removals and other changes that cannot be done without a BC-break More details here: https://github.com/sonata-project/SonataCacheBundle/blob/3.x/CONTRIBUTING.md#base-branch --> I am targeting this branch, because {reason}. diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml index 8bb2bff..2a52088 100644 --- a/.github/workflows/documentation.yaml +++ b/.github/workflows/documentation.yaml @@ -8,7 +8,7 @@ on: push: branches: - 3.x - - master + - 4.x pull_request: jobs: diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4557673..40c5aeb 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -8,7 +8,7 @@ on: push: branches: - 3.x - - master + - 4.x pull_request: jobs: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8824ceb..d8922da 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,7 +8,7 @@ on: push: branches: - 3.x - - master + - 4.x pull_request: jobs: diff --git a/.symfony.bundle.yaml b/.symfony.bundle.yaml index 8b374e6..6d422c3 100644 --- a/.symfony.bundle.yaml +++ b/.symfony.bundle.yaml @@ -4,16 +4,16 @@ branches: - 3.x - - master + - 4.x maintained_branches: - 3.x - - master + - 4.x doc_dir: 'docs/' current_branch: 3.x -dev_branch: master +dev_branch: 4.x # dev_branch_alias: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e661467..b9722a0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -216,11 +216,11 @@ 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 | `3.x` | | -Bug fixes | No (Only if no choice) | Major | `master` | | +Bug fixes | No (Only if no choice) | Major | `4.x` | | Feature | Yes | Minor | `3.x` | | -Feature | No (Only if no choice) | Major | `master` | | +Feature | No (Only if no choice) | Major | `4.x` | | Deprecation | Yes (Have to) | Minor | `3.x` | | -Deprecation removal | No (Can't be) | Major | `master` | | +Deprecation removal | No (Can't be) | Major | `4.x` | | Notes: * Branch `3.x` is the branch of the **latest stable** minor release and @@ -228,7 +228,7 @@ Notes: * 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 `4.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 index 3d7700a..91ef35d 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This bundle provides caching services Branch | Github Actions | Code Coverage | Documentation | ------ | -------------- | ------------- | ------------- | 3.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] | +4.x | [![Test][test_unstable_badge]][test_unstable_link] | [![Coverage Status][coverage_unstable_badge]][coverage_unstable_link] | [![Documentation Status][documentation_unstable_badge]][documentation_unstable_link] | ## Documentation @@ -38,15 +38,15 @@ This package is available under the [MIT license](LICENSE). [test_stable_badge]: https://github.com/sonata-project/SonataCacheBundle/workflows/Test/badge.svg?branch=3.x [test_stable_link]: https://github.com/sonata-project/SonataCacheBundle/actions?query=workflow:test+branch:3.x -[test_unstable_badge]: https://github.com/sonata-project/SonataCacheBundle/workflows/Test/badge.svg?branch=master -[test_unstable_link]: https://github.com/sonata-project/SonataCacheBundle/actions?query=workflow:test+branch:master +[test_unstable_badge]: https://github.com/sonata-project/SonataCacheBundle/workflows/Test/badge.svg?branch=4.x +[test_unstable_link]: https://github.com/sonata-project/SonataCacheBundle/actions?query=workflow:test+branch:4.x [coverage_stable_badge]: https://codecov.io/gh/sonata-project/SonataCacheBundle/branch/3.x/graph/badge.svg [coverage_stable_link]: https://codecov.io/gh/sonata-project/SonataCacheBundle/branch/3.x -[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataCacheBundle/branch/master/graph/badge.svg -[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataCacheBundle/branch/master +[coverage_unstable_badge]: https://codecov.io/gh/sonata-project/SonataCacheBundle/branch/4.x/graph/badge.svg +[coverage_unstable_link]: https://codecov.io/gh/sonata-project/SonataCacheBundle/branch/4.x [documentation_stable_badge]: https://readthedocs.org/projects/sonatacachebundle/badge/?version=3.x [documentation_stable_link]: https://docs.sonata-project.org/projects/SonataCacheBundle/en/3.x/?badge=3.x -[documentation_unstable_badge]: https://readthedocs.org/projects/sonatacachebundle/badge/?version=master -[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataCacheBundle/en/master/?badge=master +[documentation_unstable_badge]: https://readthedocs.org/projects/sonatacachebundle/badge/?version=4.x +[documentation_unstable_link]: https://docs.sonata-project.org/projects/SonataCacheBundle/en/4.x/?badge=4.x