Merge pull request #12 from bUnit-dev/release/v1.16

Release of new minor version v1.16

Author: egil

.github/workflows/prepare-release.yml

@@ -60,6 +60,10 @@ jobs:
           git checkout release/v$NBGV_MajorMinorVersion
           echo "::set-output name=RELEASE_VERSION_COMMIT_MESSAGE::$(git log --format=%B -n 1)"
       
+      # Workaround since nbgv prepare-release does not sign commits.
+      # This undo's the commits, keeps the version changes, and commits again with signing
+      # with the saved commit messages from previous step.
+      # See: https://github.com/dotnet/Nerdbank.GitVersioning/issues/594
       - name: 🛠️ Sign commits on main and release branch
         run: |
           git checkout release/v$NBGV_MajorMinorVersion

.github/workflows/release.yml

@@ -7,13 +7,17 @@ on:
       - stable
     types:
       - closed
+    paths-ignore:
+      - 'docs/**'      
 
   workflow_dispatch:
 
 jobs:  
   release:
     name: 🎁 Publish new release
-    if: github.ref == 'refs/heads/stable' || github.event.pull_request.merged == true # only merged pull requests must trigger this job
+    # Only run on manual dispatch or on merged 'release-' pull requests
+    if: github.ref == 'refs/heads/stable' || 
+        github.event.pull_request.merged == true && startsWith(github.ref, 'refs/heads/release-')
     runs-on: ubuntu-latest
     steps:
 
@@ -60,7 +64,7 @@ jobs:
           dotnet-version: '5.0.x'
 
       - name: 🛠️ Building library in release mode
-        run: dotnet pack -c release -p:ContinuousIntegrationBuild=true -p:PublicRelease=true
+        run: dotnet pack src/ -c release -p:ContinuousIntegrationBuild=true
 
       - name: 🛠️ Upload library to NuGet.org repository
         run: echo "TODO"
@@ -73,13 +77,13 @@ jobs:
       - name: 🛠️ Commit CHANGELOG.md to stable branch
         run: |
           git add CHANGELOG.md
-          git commit -m "Updated CHANGELOG.md for ${{ env.NBGV_SimpleVersion }} release"
+          git commit -S -m "Updated CHANGELOG.md for ${{ env.NBGV_SimpleVersion }} release"
           git push origin stable
 
       - name: ⏩ Merge stable with main
         run: | 
           git checkout main
-          git merge stable
+          git merge -S stable
           git push origin main
                 
       - name: 🛠️ Create GitHub release

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+testing
+
 ## [1.15.18] - 2021-04-23
 
 ### Added

docs/hello.md

@@ -0,0 +1 @@
+test

Directory.Build.props src/Directory.Build.propsDirectory.Build.props renamed to src/Directory.Build.props

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