Merge pull request #11 from bUnit-dev/release/v1.15

Release of new minor version v1.15

Author: egil

.github/workflows/prepare-release.yml

@@ -20,10 +20,18 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: 🛠️ Get Changelog Entry
+        id: changelog_reader
+        uses: mindsers/changelog-reader-action@v2
+        with:
+          version: Unreleased
+          path: ./CHANGELOG.md
+      
       - name: ☑ Check that release contains changes
         if: steps.changelog_reader.outputs.changes == ''
         run: |
           echo "::error file=CHANGELOG.md::The unreleased section in the changelog is empty. Nothing to release."
+          exit 1
 
       - name: ⚙️ Import GPG key
         id: import_gpg
@@ -45,9 +53,24 @@ jobs:
           setAllVars: true
 
       - name: 🛠️ Increment version.json on main + create release branch
+        id: versions
+        run: |
+          nbgv prepare-release --versionIncrement ${{ github.event.inputs.versionIncrement }}          
+          echo "::set-output name=MAIN_VERSION_COMMIT_MESSAGE::$(git log --format=%B -n 1 --skip 1)"
+          git checkout release/v$NBGV_MajorMinorVersion
+          echo "::set-output name=RELEASE_VERSION_COMMIT_MESSAGE::$(git log --format=%B -n 1)"
+      
+      - name: 🛠️ Sign commits on main and release branch
         run: |
-          nbgv prepare-release --versionIncrement ${{ github.event.inputs.versionIncrement }}
           git checkout release/v$NBGV_MajorMinorVersion
+          git reset --soft HEAD~1
+          git commit -S -m "${{ steps.versions.outputs.RELEASE_VERSION_COMMIT_MESSAGE }}"
+          
+          git checkout main
+          git reset --hard HEAD~1
+          git reset --soft HEAD~1
+          git commit -S -m "${{ steps.versions.outputs.MAIN_VERSION_COMMIT_MESSAGE }}"
+          git merge -S -X ours release/v$NBGV_MajorMinorVersion
           
       - name: ⏩ Push version.json updates to main
         run: git push origin main

.github/workflows/release.yml

@@ -81,9 +81,7 @@ jobs:
           git checkout main
           git merge stable
           git push origin main
-          
-      - run: echo "IS_PUBLIC_RELEASE=${NBGV_PublicRelease,,}" >> ${GITHUB_ENV}
-      
+                
       - name: 🛠️ Create GitHub release
         uses: thomaseizinger/[email protected]
         env:
@@ -93,4 +91,4 @@ jobs:
           name: Release ${{ env.NBGV_SimpleVersion }}
           body: ${{ steps.changelog_reader.outputs.changes }}
           draft: false
-          prerelease: ${{ env.IS_PUBLIC_RELEASE }}
+          prerelease: ${{ env.NBGV_PublicRelease == 'False' }}

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- something added
+
 ## [1.14.7] - 2021-04-23
 
 tadat

version.json

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