From ae7eeeb850812a2a1529b9a107e647f0e5373bf7 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 13:53:22 -0600 Subject: [PATCH 1/7] Update gitversion --- GitVersion.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index d5f370a83..6a170eb58 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -19,18 +19,19 @@ branches: #is-source-branch-for: ['v2'] source-branches: [] - main: - tag: rc + v2: + mode: ContinuousDeployment + is-release-branch: true + tag: prealpha increment: Patch - source-branches: - - develop - - main + regex: ^v2?[/-] + source-branches: ['v2_develop'] + feature: tag: useBranchName regex: ^features?[/-] source-branches: - - develop - - main + - v2_develop pull-request: tag: PullRequest.{BranchName} increment: Inherit From b2bbd42a5079b3702d51b8ae7a746b8142a0c111 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 13:59:36 -0600 Subject: [PATCH 2/7] Updated yml --- .github/workflows/api-docs.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/dotnet-core.yml | 4 ++-- GitVersion.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 0386c3fef..b2c998fad 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -2,7 +2,7 @@ name: Build and publish API docs on: push: - branches: [main, develop, v2_develop] + branches: [main, v2_develop] permissions: id-token: write diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e7d445314..de87f35c1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -4,7 +4,7 @@ name: "Code scanning" on: push: - branches: [main] + branches: [main, v2_release] paths-ignore: - '**/*.md' - '**/*.txt' @@ -12,7 +12,7 @@ on: - docs - docfx pull_request: - branches: [main] + branches: [main, v2_release] paths-ignore: - '**/*.md' - '**/*.txt' diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 502cfb89f..3c92c7854 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -2,11 +2,11 @@ name: Build & Test Terminal.Gui with .NET Core on: push: - branches: [ v2, v2_develop ] + branches: [ v2_release, v2_develop ] paths-ignore: - '**.md' pull_request: - branches: [ v2, v2_develop ] + branches: [ v2_release, v2_develop ] paths-ignore: - '**.md' diff --git a/GitVersion.yml b/GitVersion.yml index 6a170eb58..6591516d9 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -24,7 +24,7 @@ branches: is-release-branch: true tag: prealpha increment: Patch - regex: ^v2?[/-] + regex: ^v2_release?[/-] source-branches: ['v2_develop'] feature: From 404b406f8c103884d134e3a45584c1c1c2a2974b Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:01:49 -0600 Subject: [PATCH 3/7] Updated yml --- GitVersion.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 6591516d9..91c174714 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -19,11 +19,10 @@ branches: #is-source-branch-for: ['v2'] source-branches: [] - v2: + v2_release: mode: ContinuousDeployment is-release-branch: true tag: prealpha - increment: Patch regex: ^v2_release?[/-] source-branches: ['v2_develop'] From aeb6ed54790236e7fd564b0739c0a02f73fc73b8 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:07:50 -0600 Subject: [PATCH 4/7] Updated yml --- GitVersion.yml | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 91c174714..4727f4315 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,35 +2,36 @@ mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre branches: - develop: - mode: ContinuousDeployment - tag: pre - regex: develop - source-branches: - - main - pre-release-weight: 100 + # develop: + # mode: ContinuousDeployment + # tag: pre + # regex: develop + # source-branches: + # - main + # pre-release-weight: 100 - v2_develop: - mode: ContinuousDeployment - tag: pre - regex: ^v2_develop?[/-] - is-release-branch: true - tracks-release-branches: true - #is-source-branch-for: ['v2'] - source-branches: [] + # v2_develop: + # mode: ContinuousDeployment + # tag: pre + # regex: ^v2_develop?[/-] + # is-release-branch: true + # tracks-release-branches: true + # #is-source-branch-for: ['v2'] + # source-branches: [] - v2_release: - mode: ContinuousDeployment - is-release-branch: true - tag: prealpha - regex: ^v2_release?[/-] - source-branches: ['v2_develop'] + # v2_release: + # mode: ContinuousDeployment + # tag: prealpha + # regex: ^v2_release?[/-] + # is-release-branch: true + # source-branches: [] + + # feature: + # tag: useBranchName + # regex: ^features?[/-] + # source-branches: + # - v2_develop - feature: - tag: useBranchName - regex: ^features?[/-] - source-branches: - - v2_develop pull-request: tag: PullRequest.{BranchName} increment: Inherit From 6f9e79249453df2b7fda23ab80e1bb4b06d6cc8c Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:15:05 -0600 Subject: [PATCH 5/7] Updated yml --- GitVersion.yml | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 4727f4315..0782f01c2 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -10,31 +10,39 @@ branches: # - main # pre-release-weight: 100 - # v2_develop: - # mode: ContinuousDeployment - # tag: pre - # regex: ^v2_develop?[/-] - # is-release-branch: true - # tracks-release-branches: true - # #is-source-branch-for: ['v2'] - # source-branches: [] + v2_develop: + mode: ContinuousDeployment + tag: pre + regex: ^v2_develop?[/-] + #is-release-branch: true + tracks-release-branches: true + is-source-branch-for: ['v2_release'] + source-branches: [] - # v2_release: - # mode: ContinuousDeployment - # tag: prealpha - # regex: ^v2_release?[/-] - # is-release-branch: true - # source-branches: [] - - # feature: - # tag: useBranchName - # regex: ^features?[/-] - # source-branches: - # - v2_develop + v2_release: + mode: ContinuousDeployment + tag: prealpha + regex: ^v2_release?[/-] + #is-release-branch: true + source-branches: ['v2_develop'] pull-request: + mode: ContinuousDeployment tag: PullRequest.{BranchName} increment: Inherit + tag-number-pattern: '[/-](?\d+)' + regex: ^(pull|pull\-requests|pr)[/-] + source-branches: + - develop + - main + - release + - v2_develop + - v2_release + - feature + - support + - hotfix + pre-release-weight: 30000 + ignore: sha: [] From f2a14a18f04d819685a484cc56df6ceff4d13e16 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:16:50 -0600 Subject: [PATCH 6/7] Updated yml --- GitVersion.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index 0782f01c2..fb1ea3bb9 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -22,8 +22,8 @@ branches: v2_release: mode: ContinuousDeployment tag: prealpha - regex: ^v2_release?[/-] - #is-release-branch: true + regex: v2_release + is-release-branch: true source-branches: ['v2_develop'] pull-request: From f71b50448e1a45c6663c1525e63bd8fa0abfbf69 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:18:52 -0600 Subject: [PATCH 7/7] v2_develop builds get '-dev' prefix --- GitVersion.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index fb1ea3bb9..af28d2f24 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,17 +2,17 @@ mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre branches: - # develop: - # mode: ContinuousDeployment - # tag: pre - # regex: develop - # source-branches: - # - main - # pre-release-weight: 100 + develop: + mode: ContinuousDeployment + tag: pre + regex: develop + source-branches: + - main + pre-release-weight: 100 v2_develop: mode: ContinuousDeployment - tag: pre + tag: dev regex: ^v2_develop?[/-] #is-release-branch: true tracks-release-branches: true