Reduce to only one release branch
This commit is contained in:
@@ -4,11 +4,11 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
checkSyntax:
|
checkSyntax:
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
testLinux:
|
testLinux:
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
testMac:
|
testMac:
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- releases/**
|
- release
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
testWin:
|
testWin:
|
||||||
|
|||||||
+6
-7
@@ -22,14 +22,13 @@ just make a pull request directly.
|
|||||||
|
|
||||||
## Picking the Correct Branch for a Pull Request
|
## Picking the Correct Branch for a Pull Request
|
||||||
|
|
||||||
As of April 2024, pre-releases and point releases (like 2.x) are made from the `main` branch. The
|
The `main` branch is the default branch. For general changes, please make a new branch in your own
|
||||||
`main` branch is the default branch. For general changes, please make a new branch in your own fork
|
fork from the current `main` branch. Do not make pull requests from your copy of the `main` branch.
|
||||||
from the current `main` branch. Do not make pull requests from your copy of the `main` branch.
|
|
||||||
|
|
||||||
If you are submitting a fix to a current release, say 2.4, you must do so from the correct release
|
As of April 2024, releases are made from the `release` branch. If you are submitting a fix to a
|
||||||
branch. For 2.4 this is `releases/v2.4`. If you make such a fix on the `main` branch, **it cannot
|
current release you must do so from the `release` branch. If you make such a fix on the `main`
|
||||||
be included in a 2.4.x release**. This also applies to the current documentation published on the
|
branch, **it cannot be included in a patch release**. This also applies to the documentation for
|
||||||
main website.
|
the latest release published on the main website.
|
||||||
|
|
||||||
**Also check the following:**
|
**Also check the following:**
|
||||||
|
|
||||||
|
|||||||
@@ -49,9 +49,9 @@ code, please also read the full
|
|||||||
|
|
||||||
Project credits are available in [CREDITS.md](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md).
|
Project credits are available in [CREDITS.md](https://github.com/vkbo/novelWriter/blob/main/CREDITS.md).
|
||||||
|
|
||||||
**Note:** As of April 2024, pre-releases and point releases (2.x) are made from the `main` branch.
|
**Note:** As of April 2024 only pre-releases are made from the `main` branch. Full releases are
|
||||||
Patches are made from `releases/v2.x` branches. So if you're submitting a fix to a current release,
|
made from the `release` branch. So if you're submitting a fix to a current release, **including
|
||||||
**including changes to documentation**, they must be made to the correct branch.
|
changes to documentation**, they must be made to the 'release' branch.
|
||||||
|
|
||||||
### Translations
|
### Translations
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user