Bladeren bron

backported from v2_release

Tig 1 jaar geleden
bovenliggende
commit
19c059de20
3 gewijzigde bestanden met toevoegingen van 27 en 18 verwijderingen
  1. 1 1
      .github/workflows/api-docs.yml
  2. 2 2
      .github/workflows/dotnet-core.yml
  3. 24 15
      GitVersion.yml

+ 1 - 1
.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 

+ 2 - 2
.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'
       

+ 24 - 15
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: '[/-](?<number>\d+)'
+    regex: ^(pull|pull\-requests|pr)[/-]
+    source-branches:
+    - develop
+    - main
+    - release
+    - v2_develop
+    - v2_release
+    - feature
+    - support
+    - hotfix
+    pre-release-weight: 30000
+
 ignore:
   sha: []