sync with stable branch

This commit is contained in:
Axel Kohlmeyer 2023-01-13 14:47:51 -05:00
parent 652a8804e2
commit 50cc866081
No known key found for this signature in database
GPG Key ID: D9B44E93BF0C375A
1 changed files with 9 additions and 8 deletions

View File

@ -31,17 +31,18 @@ for unicode characters and only all-ASCII source code is accepted.
# Version Updates # Version Updates
LAMMPS follows a continuous release development model. We aim to keep LAMMPS follows a continuous release development model. We aim to keep
the development version (develop branch) always fully functional and the development version (`develop` branch) always fully functional and
employ a variety of automatic testing procedures to detect failures employ a variety of automatic testing procedures to detect failures
of existing functionality from adding or modifying features. Most of of existing functionality from adding or modifying features. Most of
those tests are run on pull requests *before* merging to the development those tests are run on pull requests *before* merging to the `develop`
branch. The develop branch is protected, so all changes *must* be branch. The `develop` branch is protected, so all changes *must* be
submitted as a pull request and thus cannot avoid the automated tests. submitted as a pull request and thus cannot avoid the automated tests.
Additional tests are run *after* merging. Before releases are made Additional tests are run *after* merging. Before releases are made
*all* tests must have cleared. Then a release tag is applied and the *all* tests must have cleared. Then a release tag is applied and the
release branch fast-forwarded to that tag. Bug fixes and updates are `release` branch is fast-forwarded to that tag. This is often referred
applied to the current development branch and thus will be available in to as a patch release. Bug fixes and updates are
the next (patch) release. For stable releases, selected bug fixes are applied first to the `develop` branch. Later, they appear in the `release`
back-ported and occasionally published as update releases. There are branch when the next patch release occurs.
only updates to the latest stable release. For stable releases, selected bug fixes, updates, and new functionality
are pushed to the `stable` branch and a new stable tag is applied.