From 8a21b93559ded6377040620076b73997eb5d30d7 Mon Sep 17 00:00:00 2001 From: Gregory Nickonov Date: Sun, 7 Dec 2025 00:11:09 +0300 Subject: [PATCH 1/3] fix: Update GitVersion to use ContinuousDeployment mode on the main branch --- GitVersion.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GitVersion.yml b/GitVersion.yml index 8fb539d..e9c8cff 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -13,8 +13,10 @@ no-bump-message: '\+semver:\s?none' branches: main: regex: ^main$ + mode: ContinuousDeployment # Для main используем ContinuousDeployment режим increment: Patch # Default для коммитов без conventional prefix is-release-branch: true + label: '' # Пустой label означает отсутствие pre-release label feature: regex: ^feature[/-] From f1f1c9b941c7b8327d5ecc2ab777d3fa1b9ef405 Mon Sep 17 00:00:00 2001 From: Gregory Nickonov Date: Sun, 7 Dec 2025 15:42:17 +0300 Subject: [PATCH 2/3] Switch to GitHubFlow workflow --- GitVersion.yml | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index e9c8cff..394ffbd 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,36 +1,19 @@ -# Используем ContinuousDelivery режим -mode: ContinuousDelivery +# Используем встроенный workflow для GitHub Flow +workflow: GitHubFlow/v1 -# Включить версионирование на основе commit messages (conventional commits) -commit-message-incrementing: Enabled +# Включить версионирование на основе MERGE commit messages (conventional commits) +# MergeMessageOnly - анализировать только merge commits, игнорировать промежуточные коммиты в PR +commit-message-incrementing: MergeMessageOnly # Настройка распознавания conventional commits major-version-bump-message: '\+semver:\s?(breaking|major)|^(feat|fix)!:|BREAKING\s+CHANGE:' minor-version-bump-message: '\+semver:\s?(feature|minor)|^feat(\(.+\))?:' -patch-version-bump-message: '\+semver:\s?(fix|patch)|^fix(\(.+\))?:' +patch-version-bump-message: '\+semver:\s?(fix|patch)|^(fix|chore|docs|style|refactor|test|build|ci|perf)(\(.+\))?:' no-bump-message: '\+semver:\s?none' branches: main: - regex: ^main$ - mode: ContinuousDeployment # Для main используем ContinuousDeployment режим - increment: Patch # Default для коммитов без conventional prefix - is-release-branch: true - label: '' # Пустой label означает отсутствие pre-release label - - feature: - regex: ^feature[/-] - increment: Patch # Default для коммитов без conventional prefix - is-release-branch: false - track-merge-target: true - label: alpha - - pull-request: - regex: ^(pull|pull\-requests|pr)[/-](?\d+) - increment: Patch # Default для коммитов без conventional prefix - is-release-branch: false - track-merge-target: true - label: pr-{Number} + label: '' # Переопределяем label для main, чтобы версии были без pre-release suffix ignore: sha: [] \ No newline at end of file From 219a74ae50815309f0940db79a609679c0411516 Mon Sep 17 00:00:00 2001 From: Gregory Nickonov Date: Sun, 7 Dec 2025 16:00:25 +0300 Subject: [PATCH 3/3] Update PR label --- GitVersion.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GitVersion.yml b/GitVersion.yml index 394ffbd..bac1aad 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -15,5 +15,9 @@ branches: main: label: '' # Переопределяем label для main, чтобы версии были без pre-release suffix + pull-request: + regex: ^(pull|pull\-requests|pr)[/-](?\d+) + label: pr-{Number} + ignore: sha: [] \ No newline at end of file