Merge pull request #44 from bUnit-dev/release/v2.8

Release of new minor version v2.8

Author: egil

.github/workflows/release.yml

@@ -102,14 +102,16 @@ jobs:
           draft: false
           prerelease: ${{ env.NBGV_PublicRelease == 'False' }}
 
-      - name: ⏩ Merge stable with main, push main        
+      - name: ⏩ Merge stable with main, push main
+        id: mergeMainline
+        continue-on-error: true
         run: | 
           git checkout main
           git merge -S stable
           git push origin main
           
       - name: ⏭ Create pull request from stable to main when direct merge fails
-        if: ${{ failure() }}
+        if: steps.mergeMainline.outcome == 'failure'
         uses: thomaseizinger/create-pull-request@1.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+test
+
 ## [2.7.0] - 2021-04-29
 
 Added workflow diagram.

src/Program.cs

@@ -7,7 +7,7 @@ class Program
         static void Main(string[] args)
         {
             Console.WriteLine("Hello World from Twitch!");
-            Console.WriteLine("Hello World from Twitch!");
+            Console.WriteLine("Hello World from Twitch!");dddd
         }
     }
 }

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.7",
+  "version": "2.8",
   "assemblyVersion": {
     "precision": "revision"
   },