diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-12-23 12:41:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-23 12:41:44 +0000 |
| commit | fecd206e9c21f8bc1f99e058464dccecec063007 (patch) | |
| tree | 74c752e117e41551d557aa986005d27e10e7f627 /README.md | |
| parent | e6701712e12189506e49be8c0e25c52a2b1325a1 (diff) | |
| download | vyos-build-fecd206e9c21f8bc1f99e058464dccecec063007.tar.gz vyos-build-fecd206e9c21f8bc1f99e058464dccecec063007.zip | |
Update branch names in the README
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 29 |
1 files changed, 11 insertions, 18 deletions
@@ -51,28 +51,21 @@ be found in our [Documentation - Build VyOS](https://docs.vyos.io/en/latest/cont # Development Branches -The default branch that contains the most recent VyOS code is called `current` -rather than `master`. We know it's confusing, but it's not easy to fix. In a -nutshell, the code we inherited from Vyatta Core had its `master` branch so out -of sync with everything it was beyond any repair. Vyatta developers used to create -a new branch not when a release is ready for code freeze, but rather before -starting to work on a new release. This is hard to change in existing code, so -this is just the way it is, for now. - -All new code goes to the `current` branch. When it's time for a code freeze, a +The default branch that contains the most recent VyOS code is called `current`. +We may or may not eventually switch to `main`. + +All new code goes to the `current` branch. When a new LTS release is ready for feature freeze, a new branch is created for the release, and new code from `current` is backported to the release branch as needed. -In packages that originate from VyOS the master branch is kept in sync with -`current`, but we still use `current` as default branch for uniformity. When the -last legacy package is gone, we will switch to using the `master` branch and -retire `current`. - Post-1.2.0 branches are named after constellations sorted by area from smallest to largest. There are 88 of them, here's the [complete list](https://en.wikipedia.org/wiki/IAU_designated_constellations_by_area). -* VyOS 1.2: `crux` (Southern Cross) -* VyOS 1.3: `equuleus` (Little Horse) -* VyOS 1.4: `sagitta` (Arrow) -* ... +Existing branches: + +* VyOS 1.4: `sagitta` (Arrow) [LTS] +* VyOS 1.3: `equuleus` (Little Horse) [LTS] +* VyOS 1.2: `crux` (Southern Cross) [Unsupported] + +The next LTS release will be VyOS 1.5 `circinus` (Compasses). |