Skip to content

Commit 5353f66

Browse files
committed
Fixed yml
1 parent 847e710 commit 5353f66

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

.github/workflows/api-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and publish API docs
33
on:
44
push:
55
# only publish v2 (main or develop); v2 is published via the Terminal.GuiV2Docs repo
6-
branches: [main, develop]
6+
branches: [v1_release, v1_develop]
77
paths:
88
- docfx/**
99

.github/workflows/dotnet-core.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: .NET Core
22

33
on:
44
push:
5-
branches: [ main, develop ]
5+
branches: [ v1_release, v1_develop ]
66
paths-ignore:
77
- '**.md'
88
pull_request:
9-
branches: [ main, develop ]
9+
branches: [ v1_release, v1_develop ]
1010
paths-ignore:
1111
- '**.md'
1212

.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish Terminal.Gui
22

33
on:
44
push:
5-
branches: [ main, develop, v2_release, v2_develop ]
5+
branches: [ v1_release, v1_develop, v2_release, v2_develop ]
66
tags:
77
- v*
88
paths-ignore:

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ We welcome contributions from the community. See [Issues](https://github.com/gui
1212

1313
Terminal.Gui uses the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branching model.
1414

15-
* The `main` branch is always stable, and always matches the most recently released Nuget package.
16-
* The `develop` branch is where bug-fixes to v1.x happens. It is the default branch.
15+
* The `v1_release` branch is always stable, and always matches the most recently released Nuget package.
16+
* The `v1__develop` branch is where bug-fixes to v1.x happens. It is the default branch.
1717
* The `v2_develop` branch is where development on v2.x happens.
1818

1919
### Forking Terminal.Gui

GitVersion.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ mode: ContinuousDeployment
22
tag-prefix: '[vV]'
33
continuous-delivery-fallback-tag: pre
44
branches:
5-
develop:
5+
v1_develop:
66
mode: ContinuousDeployment
77
tag: pre
8-
regex: develop
8+
regex: v1_develop
99
source-branches:
10-
- main
10+
- v1_release
1111
pre-release-weight: 100
12-
main:
12+
v1_release:
1313
tag: rc
1414
increment: Patch
15+
regex: v1_release
1516
source-branches:
16-
- develop
17-
- main
18-
feature:
17+
- v1_develop
18+
- v1_release
19+
v1_feature:
1920
tag: useBranchName
2021
regex: ^features?[/-]
2122
source-branches:
22-
- develop
23-
- main
23+
- v1_develop
24+
- v1_release
2425
pull-request:
2526
tag: PullRequest.{BranchName}
2627
increment: Inherit

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dotnet run
3737
* [Conceptual Documentation](https://gui-cs.github.io/Terminal.Gui/docs/index.html)
3838
* [API Documentation](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui)
3939

40-
_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))_
40+
_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))_
4141

4242
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.
4343

0 commit comments

Comments
 (0)