chore: introduce the stable-4.x branch (#2888)
### Description Related to https://github.com/libretime/libretime/issues/2887
This commit is contained in:
Jonas L
GitHub
parent
4c40fab58e
commit
f6d57d5f2d
|
|
@ -10,7 +10,7 @@
|
|||
"automerge": true,
|
||||
"automergeType": "branch"
|
||||
},
|
||||
"baseBranches": ["main", "stable"],
|
||||
"baseBranches": ["main"],
|
||||
"labels": ["dependencies"],
|
||||
"packageRules": [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: Analyzer
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/analyzer.yml
|
||||
|
|
@ -12,7 +12,7 @@ on:
|
|||
- tools/python*
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/analyzer.yml
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: API Client
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/api-client.yml
|
||||
|
|
@ -12,7 +12,7 @@ on:
|
|||
- tools/python*
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/api-client.yml
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: API
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/api.yml
|
||||
|
|
@ -12,7 +12,7 @@ on:
|
|||
- tools/python*
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/api.yml
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ name: Container
|
|||
on:
|
||||
push:
|
||||
tags: ["[0-9]+.[0-9]+.[0-9]+*"]
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ name: Docs
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/vale/**
|
||||
- .github/workflows/docs.yml
|
||||
- docs/**
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/vale/**
|
||||
- .github/workflows/docs.yml
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ name: Legacy
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/legacy.yml
|
||||
- api/**
|
||||
- legacy/**
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/legacy.yml
|
||||
- api/**
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: Playout
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/playout.yml
|
||||
|
|
@ -13,7 +13,7 @@ on:
|
|||
- tools/python*
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/playout.yml
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ name: Project
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
pull_request:
|
||||
types: [opened, reopened, synchronize, edited]
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.ref }}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: Shared
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/shared.yml
|
||||
|
|
@ -11,7 +11,7 @@ on:
|
|||
- tools/python*
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/shared.yml
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ name: Worker
|
|||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/worker.yml
|
||||
|
|
@ -11,7 +11,7 @@ on:
|
|||
- tools/python*
|
||||
|
||||
pull_request:
|
||||
branches: [main, stable]
|
||||
branches: [main, stable-*]
|
||||
paths:
|
||||
- .github/workflows/_python.yml
|
||||
- .github/workflows/worker.yml
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ LibreTime development workflows follow the standardized [C4 development process]
|
|||
- [2.4. Development Process](https://rfc.zeromq.org/spec/42/#24-development-process)
|
||||
- `16.` Maintainers MAY NOT merge incorrect patches.
|
||||
- [2.5. Branches and Releases](https://rfc.zeromq.org/spec/42/#25-branches-and-releases)
|
||||
- `1.` The project SHALL have a development branch (`main`) that always holds the latest in-progress version and SHOULD always build. The project MAY have a bug fixes only branch (`stable`) that always holds the current stable version and SHOULD always build.
|
||||
- `3.` To make a stable release a Maintainer shall tag the repository. Stable releases SHALL always be released from the repository `main` or `stable` branches.
|
||||
- `1.` The project SHALL have a development branch (`main`) that always holds the latest in-progress version and SHOULD always build. The project MAY have a bug fixes only branch (`stable-*`) that always holds the current stable version and SHOULD always build.
|
||||
- `3.` To make a stable release a Maintainer shall tag the repository. Stable releases SHALL always be released from the repository `main` or `stable-*` branches.
|
||||
|
||||
## Contribute financially
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ title: Development workflows
|
|||
LibreTime uses [Github pull requests to manage changes](https://docs.github.com/en/get-started/quickstart/contributing-to-projects). The workflow looks like this:
|
||||
|
||||
- [Create a fork of the project](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
|
||||
- Check out the `main` branch. If you're making a minor or small documentation change you can check out the `stable` branch.
|
||||
- Check out the `main` branch.
|
||||
- Create a new branch based on the checked out branch.
|
||||
- Work on your changes locally. Try to keep each commit small to make reviews easier.
|
||||
- Lint and test the codebase, for example using the `make lint` or `make test` commands inside the app folder you want to check.
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ Once a release is desired, checkout the release branch:
|
|||
```bash
|
||||
# For a release on the main branch
|
||||
git checkout release-please--branches--main--components--libretime
|
||||
# For a release on the stable branch
|
||||
git checkout release-please--branches--stable--components--libretime
|
||||
# For a release on the stable-4.x branch
|
||||
git checkout release-please--branches--stable-4.x--components--libretime
|
||||
```
|
||||
|
||||
### 2. Release note
|
||||
|
|
|
|||
|
|
@ -30,3 +30,4 @@ New releases target the current stable distributions release, and development sh
|
|||
| Versions | | | | |
|
||||
| 3.0.x | deprecated | deprecated | recommended | recommended |
|
||||
| 3.1.x | | | recommended | recommended |
|
||||
| 4.0.x | | | recommended | recommended |
|
||||
|
|
|
|||
Loading…
Reference in New Issue