-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use
main
instead of master
as default branch name
- Loading branch information
Showing
7 changed files
with
23 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ name: L10n Update | |
on: | ||
push: | ||
branches: | ||
- master | ||
- main | ||
|
||
jobs: | ||
trigger-update: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,9 +25,9 @@ Check issues at https://github.com/Icinga/icingaweb2 | |
|
||
### Backport Commits | ||
|
||
For minor versions not branched off git master you need | ||
to manually backport any and all commits from the | ||
master branch which should be part of this release. | ||
For minor versions not branched off the default branch you need | ||
to manually backport any and all commits from it which should | ||
be part of this release. | ||
|
||
### Authors | ||
|
||
|
@@ -67,7 +67,7 @@ the [upgrading documentation](doc/80-Upgrading.md). | |
git commit -v -a -m "Release version $VERSION" | ||
``` | ||
|
||
Create a signed tag (tags/v<VERSION>) on the `master` branch (for major | ||
Create a signed tag (tags/v<VERSION>) on the default branch (for major | ||
releases) or the `support` branch (for minor releases). | ||
|
||
``` | ||
|
@@ -83,7 +83,7 @@ git push v$VERSION | |
**For major releases:** Create a new `support` branch: | ||
|
||
``` | ||
git checkout master | ||
git checkout main | ||
git checkout -b support/2.7 | ||
git push -u origin support/2.7 | ||
``` | ||
|
@@ -109,7 +109,7 @@ git clone [email protected]:packaging/deb-icingaweb2.git && cd deb-icingaweb2 | |
|
||
### Branch Workflow | ||
|
||
Checkout `master` and create a new branch. | ||
Checkout the default and create a new branch. | ||
|
||
* For releases use x.x[.x] as branch name (e.g. 2.7 or 2.7.1) | ||
* `git checkout -b $VERSION` | ||
|
@@ -198,7 +198,7 @@ git tag -s $VERSION-1 -m "Version $VERSION-1" | |
git push origin $VERSION-1 | ||
``` | ||
|
||
Now cherry pick the release commit to `master` so that the changes are transferred back to it. | ||
Now cherry pick the release commit to the default branch so that the changes are transferred back to it. | ||
|
||
**Attention**: Only the release commit. *NOT* the one switching the build type! | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters