From 475d1bbfb6e19e80338d43620ddc907f1cfcf823 Mon Sep 17 00:00:00 2001 From: Maximilian-Stefan-Ernst <34346372+Maximilian-Stefan-Ernst@users.noreply.github.com> Date: Sun, 3 Jul 2022 11:33:35 +0200 Subject: [PATCH 1/2] not all commits on main have to be tagged --- contributing.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contributing.md b/contributing.md index 00e519d90..b5fbdeb13 100644 --- a/contributing.md +++ b/contributing.md @@ -42,7 +42,6 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu ### main - contains the recent released version -- all commits are tagged ### devel - contains all changes until a new minor/major release branche is created @@ -67,7 +66,7 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu - forked from main/release/devel merged into main/release/devel. - **only** changes to documentation -### testing/xxx +### test/xxx - changes that do not touch the code but only test - **only** changes that fix faulty tests or increase test coverage - forked from main/release/devel merged into main/release/devel From 4b6e2a78c6e9db851dab11a6a209d5bac8b32888 Mon Sep 17 00:00:00 2001 From: Aaron Peikert Date: Wed, 6 Jul 2022 09:27:10 +0200 Subject: [PATCH 2/2] when to tag specifically --- contributing.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contributing.md b/contributing.md index b5fbdeb13..2e591267d 100644 --- a/contributing.md +++ b/contributing.md @@ -52,6 +52,7 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu - no new features (only bug fixes, documentation generation, etc.) - is merged into main and tagged to create a new release - also merged into devel when release is created +- trigger registrator after successfull and validated/tested merge into main ### feature/xxx: - forked from devel to develop a new feature @@ -60,6 +61,8 @@ We follow the Gitflow workflow described [here](https://www.atlassian.com/git/tu ### hotfix/xxx - forked from main - merged into main and devel (or the current release branch) and main is tagged +- trigger registrator after successfull and validated/tested merge into main + ### documentation/xxx - remember to add an apropriate tag if merged into main/release (e.g. v1.2.3+doc1 see [Documenter.jl docs](http://mortenpi.eu/Documenter.jl/dev/man/hosting/#Documentation-Versions))