From 5353f66c4bf6f723cbe56ea5c9e620aa95bb4b8e Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 11 Jul 2024 16:30:28 -0600 Subject: [PATCH] Fixed yml --- .github/workflows/api-docs.yml | 2 +- .github/workflows/dotnet-core.yml | 4 ++-- .github/workflows/publish.yml | 2 +- CONTRIBUTING.md | 4 ++-- GitVersion.yml | 19 ++++++++++--------- README.md | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 274bf6706..92caf5b21 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -3,7 +3,7 @@ name: Build and publish API docs on: push: # only publish v2 (main or develop); v2 is published via the Terminal.GuiV2Docs repo - branches: [main, develop] + branches: [v1_release, v1_develop] paths: - docfx/** diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 940d19604..750f7d93f 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -2,11 +2,11 @@ name: .NET Core on: push: - branches: [ main, develop ] + branches: [ v1_release, v1_develop ] paths-ignore: - '**.md' pull_request: - branches: [ main, develop ] + branches: [ v1_release, v1_develop ] paths-ignore: - '**.md' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 69913111f..39ba8ccd5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish Terminal.Gui on: push: - branches: [ main, develop, v2_release, v2_develop ] + branches: [ v1_release, v1_develop, v2_release, v2_develop ] tags: - v* paths-ignore: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef6426867..75cc209ff 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,8 +12,8 @@ We welcome contributions from the community. See [Issues](https://github.com/gui Terminal.Gui uses the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branching model. -* The `main` branch is always stable, and always matches the most recently released Nuget package. -* The `develop` branch is where bug-fixes to v1.x happens. It is the default branch. +* The `v1_release` branch is always stable, and always matches the most recently released Nuget package. +* The `v1__develop` branch is where bug-fixes to v1.x happens. It is the default branch. * The `v2_develop` branch is where development on v2.x happens. ### Forking Terminal.Gui diff --git a/GitVersion.yml b/GitVersion.yml index f6ded5b00..138dc2ac9 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -2,25 +2,26 @@ mode: ContinuousDeployment tag-prefix: '[vV]' continuous-delivery-fallback-tag: pre branches: - develop: + v1_develop: mode: ContinuousDeployment tag: pre - regex: develop + regex: v1_develop source-branches: - - main + - v1_release pre-release-weight: 100 - main: + v1_release: tag: rc increment: Patch + regex: v1_release source-branches: - - develop - - main - feature: + - v1_develop + - v1_release + v1_feature: tag: useBranchName regex: ^features?[/-] source-branches: - - develop - - main + - v1_develop + - v1_release pull-request: tag: PullRequest.{BranchName} increment: Inherit diff --git a/README.md b/README.md index be462f5a2..d44d8ea80 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ dotnet run * [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html) * [API Documentation](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui) -_The Documentation matches the most recent Nuget release from the `main` branch ([![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui))_ +_The Documentation matches the most recent Nuget release from the `v1_release_` branch ([![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui))_ See the [`Terminal.Gui/` README](https://github.com/gui-cs/Terminal.Gui/tree/master/Terminal.Gui) for an overview of how the library is structured. The [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html) provides insight into core concepts.