Merge branch 'v2_develop' into v2_cursesdriver-threading-fix_2847

2026-01-02 01:03:29 +01:00 · 2023-09-22 22:08:09 +01:00
parent dfba04dc9d 71dfc7c7d1
commit aa498a7f32
4 changed files with 121 additions and 74 deletions
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,42 +1,42 @@
-name: Publish Terminal.Gui v2
+name: Publish Terminal.Gui
+
 on:
  push:
+    branches: [ main, develop, v2_release, v2_develop ]
    tags:
-      - v2.0.0-alpha.*
+      - v*
+    paths-ignore:
+      - '**.md'

 jobs:
  publish:
-    name: Build and Publish v2 to Nuget.org
+    name: Build and Publish to Nuget.org
    runs-on: ubuntu-latest

    steps:
    - uses: actions/checkout@v3
      with:
-        fetch-depth: 0 #fetch-depth is needed for GitVersion
+        fetch-depth: 0 # fetch-depth is needed for GitVersion

-    - name: Install and calculate the new version with GitVersion 
+    - name: Install GitVersion 
      uses: gittools/actions/gitversion/setup@v0
      with:
-          versionSpec: '6.x'
+          versionSpec: '5.x'
          includePrerelease: true

    - name: Determine Version
      uses: gittools/actions/gitversion/execute@v0
      with:
-        useConfigFile: true      
+        useConfigFile: true
+        #additionalArguments: /b develop
      id: gitversion # step id used as reference for output values

-    - name: Display GitVersion outputs
-      run: |
-        echo "Version: ${{ steps.gitversion.outputs.SemVer }}"
-        echo "CommitsSinceVersionSource: ${{ steps.gitversion.outputs.CommitsSinceVersionSource }}"
-
    - name: Setup dotnet
      uses: actions/setup-dotnet@v3
      with:
        dotnet-version: 7.0
        dotnet-quality: 'ga'
-
+        
    - name: Install dependencies
      run: dotnet restore

@@ -48,34 +48,27 @@ jobs:
    - name: Pack
      run: dotnet pack -c Release --include-symbols -p:Version='${{ steps.gitversion.outputs.SemVer }}' 

-    #- name: Test to generate Code Coverage Report
-    #  run: |
-    #    sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
-    #    dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings
-    #    mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
+    # - name: Test to generate Code Coverage Report
+    #   run: |
+    #     sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
+    #     dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings
+    #     mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/

-    #- name: Create Test Coverage Badge
-    #  uses: simon-k/dotnet-code-coverage-badge@v1.0.0
-    #  id: create_coverage_badge
-    #  with:
-    #    label: Unit Test Coverage
-    #    color: brightgreen
-    #    path: UnitTests/TestResults/coverage.opencover.xml
-    #    gist-filename: code-coverage.json
-    #    # https://gist.github.com/migueldeicaza/90ef67a684cb71db1817921a970f8d27
-    #    gist-id: 90ef67a684cb71db1817921a970f8d27
-    #    gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }}   
-
-    #- name: Print Code Coverage
-    #  run: |
-    #    echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%"
-    #    echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}"
+    # - name: Create Test Coverage Badge
+    #   uses: simon-k/dotnet-code-coverage-badge@v1.0.0
+    #   id: create_coverage_badge
+    #   with:
+    #     label: Unit Test Coverage
+    #     color: brightgreen
+    #     path: UnitTests/TestResults/coverage.opencover.xml
+    #     gist-filename: code-coverage.json
+    #     gist-id: 90ef67a684cb71db1817921a970f8d27
+    #     gist-auth-token: ${{ secrets.GIST_AUTH_TOKEN }}   

+    # - name: Print Code Coverage
+    #   run: |
+    #     echo "Code coverage percentage: ${{steps.create_coverage_badge.outputs.percentage}}%"
+    #     echo "Badge data: ${{steps.create_coverage_badge.outputs.badge}}"
+        
    - name: Publish to NuGet.org
-      run: dotnet nuget push Terminal.Gui/bin/Release/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
-
-    - name: Unlist from NuGet.org if it's an alpha
-      run: dotnet nuget delete  --non-interactive Terminal.Gui ${{ steps.gitversion.outputs.SemVer }} --api-key ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
-      if: contains(steps.gitversion.outputs.SemVer, 'alpha')
-
-
+      run: dotnet nuget push Terminal.Gui/bin/Release/Terminal.Gui.${{ steps.gitversion.outputs.SemVer }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} 
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,21 +1,14 @@
 mode: ContinuousDeployment
 tag-prefix: '[vV]'
-continuous-delivery-fallback-tag: 'pre'
+continuous-delivery-fallback-tag: pre
 branches:
-  # v1_develop:
-  #   mode: ContinuousDeployment
-  #   tag: pre
-  #   regex: ^v1_develop?[/-]
-  #   is-release-branch: false
-  #   source-branches:
-  #   - v1
-  # v1:
-  #   tag: rc
-  #   increment: Patch
-  #   regex: ^v2?[/-]
-  #   is-release-branch: false
-  #   source-branches: []
-  #   is-mainline: true
+  develop:
+    mode: ContinuousDeployment
+    tag: pre
+    regex: develop
+    source-branches:
+    - main
+    pre-release-weight: 100

  v2_develop:
    mode: ContinuousDeployment
@@ -23,28 +16,76 @@ branches:
    regex: ^v2_develop?[/-]
    is-release-branch: true
    tracks-release-branches: true
-    is-source-branch-for: ['v2']
+    #is-source-branch-for: ['v2']
    source-branches: []
-  v2:
-    mode: ContinuousDeployment
-    is-release-branch: false
-    tag: alpha
-    increment: Patch
-    regex: ^v2?[/-]
-    source-branches: ['v2_develop']

-  # feature:
-  #   tag: useBranchName
-  #   regex: ^features?[/-]
-  #   source-branches:
-  #   - v1
-  #   - v1_develop
-  #   - v2
-  #   - v2_develop
- 
+  main:
+    tag: rc
+    increment: Patch
+    source-branches:
+    - develop
+    - main
+  feature:
+    tag: useBranchName
+    regex: ^features?[/-]
+    source-branches:
+    - develop
+    - main
  pull-request:
    tag: PullRequest.{BranchName}
    increment: Inherit
 ignore:
  sha: []
-merge-message-formats: {}
+
+
+# next-version: 2.0.0
+# mode: ContinuousDeployment
+# tag-prefix: '[vV]'
+# continuous-delivery-fallback-tag: 'pre'
+# branches:
+#   # v1_develop:
+#   #   mode: ContinuousDeployment
+#   #   tag: pre
+#   #   regex: ^v1_develop?[/-]
+#   #   is-release-branch: false
+#   #   source-branches:
+#   #   - v1
+#   # v1:
+#   #   tag: rc
+#   #   increment: Patch
+#   #   regex: ^v2?[/-]
+#   #   is-release-branch: false
+#   #   source-branches: []
+#   #   is-mainline: true
+
+#   v2_develop:
+#     mode: ContinuousDeployment
+#     tag: pre
+#     regex: ^v2_develop?[/-]
+#     is-release-branch: true
+#     tracks-release-branches: true
+#     is-source-branch-for: ['v2']
+#     source-branches: []
+#   v2:
+#     mode: ContinuousDeployment
+#     is-release-branch: false
+#     tag: alpha
+#     increment: Patch
+#     regex: ^v2?[/-]
+#     source-branches: ['v2_develop']
+
+#   # feature:
+#   #   tag: useBranchName
+#   #   regex: ^features?[/-]
+#   #   source-branches:
+#   #   - v1
+#   #   - v1_develop
+#   #   - v2
+#   #   - v2_develop
+ 
+#   pull-request:
+#     tag: PullRequest.{BranchName}
+#     increment: Inherit
+# ignore:
+#   sha: []
+# merge-message-formats: {}
--- a/Terminal.sln
+++ b/Terminal.sln
@@ -21,6 +21,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
 		GitVersion.yml = GitVersion.yml
 		global.json = global.json
+		nuget.config = nuget.config
 		.github\workflows\publish.yml = .github\workflows\publish.yml
 		README.md = README.md
 		Terminal.sln.DotSettings = Terminal.sln.DotSettings
--- a/nuget.config
+++ b/nuget.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <config>
+    <add key="defaultPushSource" value="https://api.nuget.org/v3/index.json" />
+  </config>
+  <packageSources>
+
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>