From 19c059de206f295bca8c73cc327df08d826dde51 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:20:18 -0600 Subject: [PATCH 1/6] backported from v2_release --- .github/workflows/api-docs.yml | 2 +- .github/workflows/dotnet-core.yml | 4 ++-- GitVersion.yml | 39 +++++++++++++++++++------------ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 0386c3fef..b2c998fad 100644 --- a/.github/workflows/api-docs.yml +++ b/.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 diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 502cfb89f..3c92c7854 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.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' diff --git a/GitVersion.yml b/GitVersion.yml index d5f370a83..af28d2f24 100644 --- a/GitVersion.yml +++ b/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: '[/-](?\d+)' + regex: ^(pull|pull\-requests|pr)[/-] + source-branches: + - develop + - main + - release + - v2_develop + - v2_release + - feature + - support + - hotfix + pre-release-weight: 30000 + ignore: sha: [] From 97335e4048ee27366d24758fd0bb2a3272b49beb Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:25:08 -0600 Subject: [PATCH 2/6] trying to get release tag right --- GitVersion.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index af28d2f24..ba888b3d5 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,10 +1,10 @@ mode: ContinuousDeployment tag-prefix: '[vV]' -continuous-delivery-fallback-tag: pre +continuous-delivery-fallback-tag: dev branches: develop: mode: ContinuousDeployment - tag: pre + tag: dev regex: develop source-branches: - main @@ -14,7 +14,6 @@ branches: mode: ContinuousDeployment tag: dev regex: ^v2_develop?[/-] - #is-release-branch: true tracks-release-branches: true is-source-branch-for: ['v2_release'] source-branches: [] From 02999638f089c239f5701a70c819389158ad068e Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:40:54 -0600 Subject: [PATCH 3/6] trying to fix 3052 --- .github/workflows/dotnet-core.yml | 3 ++- UnitTests/UnitTests.sln | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 UnitTests/UnitTests.sln diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 3c92c7854..26507c2b0 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -35,7 +35,8 @@ jobs: - name: Test run: | sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json - dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --blame + dotnet test --verbosity normal --blame-hang --blame-hang-dump-type full --blame-hang-timeout 5s + #dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --blame mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ # Note: this step is currently not writing to the gist for some reason diff --git a/UnitTests/UnitTests.sln b/UnitTests/UnitTests.sln new file mode 100644 index 000000000..0d950924c --- /dev/null +++ b/UnitTests/UnitTests.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests.csproj", "{A29633F2-B26E-48B2-997A-1733286E3C13}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A29633F2-B26E-48B2-997A-1733286E3C13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A29633F2-B26E-48B2-997A-1733286E3C13}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A29633F2-B26E-48B2-997A-1733286E3C13}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A29633F2-B26E-48B2-997A-1733286E3C13}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {86ED8EAD-F1D5-4F95-A0E6-6D73DFC8442F} + EndGlobalSection +EndGlobal From ec04bd55120338bde0fb21afc092efbb45a02a8f Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:45:21 -0600 Subject: [PATCH 4/6] trying to fix 3052 2 --- .github/workflows/dotnet-core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 26507c2b0..e205e6af5 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -35,8 +35,8 @@ jobs: - name: Test run: | sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json - dotnet test --verbosity normal --blame-hang --blame-hang-dump-type full --blame-hang-timeout 5s - #dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --blame + dotnet test --verbosity normal --blame + # dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --blame mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ # Note: this step is currently not writing to the gist for some reason From 8683568956c6ab7a2ef5432948202300dec1c4ac Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:46:53 -0600 Subject: [PATCH 5/6] trying to fix 3052 3 --- .github/workflows/dotnet-core.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e205e6af5..908b67eb1 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -36,7 +36,6 @@ jobs: run: | sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json dotnet test --verbosity normal --blame - # dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --blame mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ # Note: this step is currently not writing to the gist for some reason From f655d749400d8652cd0f4d9e57b4311686dc1b35 Mon Sep 17 00:00:00 2001 From: Tig Date: Sun, 7 Jul 2024 14:57:59 -0600 Subject: [PATCH 6/6] trying to fix 3052 4 --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 908b67eb1..58b75c74b 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -35,7 +35,7 @@ jobs: - name: Test run: | sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json - dotnet test --verbosity normal --blame + dotnet test --verbosity normal --blame --diag:logs/logs.txt --blame-hang --blame-hang-timeout 60s mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/ # Note: this step is currently not writing to the gist for some reason