Merge pull request #47 from MikDal002/30-add-support-for-ubuntu-latest-for-building

👷 ci(workflows): enhance Velopack release pipeline, update GitVersion and improve logging

Author: MikDal002

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=crlf
+*.sh text eol=lf
+*.cmd text eol=lf

.github/workflows/Create_Realease.yml

@@ -42,3 +42,21 @@ jobs:
         run: ./build.cmd Tests PublishToGitHubWithVelopack
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  ubuntu-latest:
+    name: ubuntu-latest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: 'Cache: .nuke/temp, ~/.nuget/packages'
+        uses: actions/cache@v4
+        with:
+          path: |
+            .nuke/temp
+            ~/.nuget/packages
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
+      - name: 'Run: Tests, PublishToGitHubWithVelopack'
+        run: ./build.cmd Tests PublishToGitHubWithVelopack
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Create_Velopack_Release.yml

@@ -42,3 +42,21 @@ jobs:
         run: ./build.cmd Tests
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  ubuntu-latest:
+    name: ubuntu-latest
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: 'Cache: .nuke/temp, ~/.nuget/packages'
+        uses: actions/cache@v4
+        with:
+          path: |
+            .nuke/temp
+            ~/.nuget/packages
+          key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
+      - name: 'Run: Tests'
+        run: ./build.cmd Tests
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/For_each_PR.yml

@@ -19,8 +19,8 @@ branches:
     # This regex will match any branch name that is NOT 'master' or 'develop'.
     # It also implicitly won't match 'release/...' or 'hotfix/...' if you add those
     # configurations later, because those more specific regexes would match first.
-    regex: ^(?!(master|develop|release|hotfix)$).*
-    label: use-branch-name
+    regex: ^(?!(master|develop|release|hotfix)$)(?<BranchName>.+)$
+    label: '{BranchName}'
     increment: Inherit
     source-branches: [develop, main, master]
     track-merge-target: false

.github/workflows/dotnet.yml

@@ -51,7 +51,7 @@ This project uses a GitFlow-inspired branching model, automated with GitVersion.
 **Supporting Branches:**
 
 *   **`feature/*`** (e.g., `feature/new-user-auth`):
-    *   Branched from `develop` for new development work.
+    *   Typically branched from `develop` for new development work, but can also originate from `main` or `master` if needed.
     *   Merged back into `develop` upon completion.
     *   **Versioning (GitVersion):**
         *   Format: `InheritedBaseVersion-BranchName.Commits` (e.g., `1.1.0-new-user-auth.3` if branched from `develop` at `1.1.0-alpha.x`).

GitVersion.yml

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Elementy rozwiązania", "El
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
+		global.json = global.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{447A1CBF-6F89-4C07-B4B1-F99C476ADCB2}"

Readme.md

@@ -0,0 +1,18 @@
+using Nuke.Common.CI.GitHubActions;
+
+[GitHubActions("For each PR",
+    GitHubActionsImage.WindowsLatest, GitHubActionsImage.UbuntuLatest, OnPullRequestBranches = new[]
+    {
+        DevelopBranch, MainBranch, MasterBranch
+    },
+    PublishArtifacts = false,
+    FetchDepth = 0,
+    InvokedTargets = new[] { nameof(Tests) },
+    CacheKeyFiles = new[] { "**/global.json", "**/*.csproj" },
+    CacheIncludePatterns = new[] { ".nuke/temp", "~/.nuget/packages" },
+    EnableGitHubToken = true
+)]
+
+public partial class Build
+{
+}

ZtrDotnetTemplates.sln

@@ -5,7 +5,7 @@
 
 [GitHubActions(
     "Create Velopack Release",
-    GitHubActionsImage.WindowsLatest,
+    GitHubActionsImage.WindowsLatest, GitHubActionsImage.UbuntuLatest,
     OnPushBranches = new[] { MasterBranch, MainBranch, DevelopBranch },
     PublishArtifacts = true,
     FetchDepth = 0,
@@ -64,6 +64,7 @@ partial class Build
                             $" --repoUrl {GitHubBrowseUrl}" +
                             $" --token {GitHubToken}" +
                             $" --publish" +
+                            $" --merge" +
                             $" --releaseName {releaseName}" +
                             $" --tag {tag}" +
                             $" --targetCommitish {GitVersion.Sha}";