Browse Source

Fixed yml

Tig 1 year ago
parent
commit
5353f66c4b

+ 1 - 1
.github/workflows/api-docs.yml

@@ -3,7 +3,7 @@ name: Build and publish API docs
 on:
 on:
   push:
   push:
   # only publish v2 (main or develop); v2 is published via the Terminal.GuiV2Docs repo
   # only publish v2 (main or develop); v2 is published via the Terminal.GuiV2Docs repo
-    branches: [main, develop]
+    branches: [v1_release, v1_develop]
     paths: 
     paths: 
       - docfx/**
       - docfx/**
 
 

+ 2 - 2
.github/workflows/dotnet-core.yml

@@ -2,11 +2,11 @@ name: .NET Core
 
 
 on:
 on:
   push:
   push:
-    branches: [ main, develop ]
+    branches: [ v1_release, v1_develop ]
     paths-ignore:
     paths-ignore:
       - '**.md'
       - '**.md'
   pull_request:
   pull_request:
-    branches: [ main, develop ]
+    branches: [ v1_release, v1_develop ]
     paths-ignore:
     paths-ignore:
       - '**.md'
       - '**.md'
       
       

+ 1 - 1
.github/workflows/publish.yml

@@ -2,7 +2,7 @@ name: Publish Terminal.Gui
 
 
 on:
 on:
   push:
   push:
-    branches: [ main, develop, v2_release, v2_develop ]
+    branches: [ v1_release, v1_develop, v2_release, v2_develop ]
     tags:
     tags:
       - v*
       - v*
     paths-ignore:
     paths-ignore:

+ 2 - 2
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. 
 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. 
 * The `v2_develop` branch is where development on v2.x happens. 
 
 
 ### Forking Terminal.Gui
 ### Forking Terminal.Gui

+ 10 - 9
GitVersion.yml

@@ -2,25 +2,26 @@ mode: ContinuousDeployment
 tag-prefix: '[vV]'
 tag-prefix: '[vV]'
 continuous-delivery-fallback-tag: pre
 continuous-delivery-fallback-tag: pre
 branches:
 branches:
-  develop:
+  v1_develop:
     mode: ContinuousDeployment
     mode: ContinuousDeployment
     tag: pre
     tag: pre
-    regex: develop
+    regex: v1_develop
     source-branches:
     source-branches:
-    - main
+    - v1_release
     pre-release-weight: 100
     pre-release-weight: 100
-  main:
+  v1_release:
     tag: rc
     tag: rc
     increment: Patch
     increment: Patch
+    regex: v1_release
     source-branches:
     source-branches:
-    - develop
-    - main
-  feature:
+    - v1_develop
+    - v1_release
+  v1_feature:
     tag: useBranchName
     tag: useBranchName
     regex: ^features?[/-]
     regex: ^features?[/-]
     source-branches:
     source-branches:
-    - develop
-    - main
+    - v1_develop
+    - v1_release
   pull-request:
   pull-request:
     tag: PullRequest.{BranchName}
     tag: PullRequest.{BranchName}
     increment: Inherit
     increment: Inherit

+ 1 - 1
README.md

@@ -37,7 +37,7 @@ dotnet run
 * [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html)
 * [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html)
 * [API Documentation](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui)
 * [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.
 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.