From 19c059de206f295bca8c73cc327df08d826dde51 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:20:18 -0600 Subject: [PATCH] backported from v2_release --- .github/workflows/api-docs.yml | 2 +- .github/workflows/dotnet-core.yml | 4 ++-- GitVersion.yml | 39 +++++++++++++++++++------------ 3 files changed, 27 insertions(+), 18 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/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 d5f370a83..af28d2f24 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -12,28 +12,37 @@ branches: v2_develop: mode: ContinuousDeployment - tag: pre + tag: dev regex: ^v2_develop?[/-] - is-release-branch: true + #is-release-branch: true tracks-release-branches: true - #is-source-branch-for: ['v2'] + is-source-branch-for: ['v2_release'] source-branches: [] - main: - tag: rc - increment: Patch - source-branches: - - develop - - main - feature: - tag: useBranchName - regex: ^features?[/-] - source-branches: - - develop - - main + 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: []