Merge branch 'stable'

Author: bUnitBot

.github/workflows/release.yml

@@ -109,17 +109,19 @@ jobs:
         continue-on-error: true
         run: |
           git checkout main
-          git merge --no-commit --no-ff stable ; if [ $? -eq 0 ] ; then echo "CAN_MERGE=true" >> $GITHUB_ENV ; else echo "CAN_MERGE=false" >> $GITHUB_ENV ; fi
+          echo "MERGE_CONFLICT_STATUS=CONFLICT" >> $GITHUB_ENV
+          git merge --no-commit --no-ff stable
+          echo "MERGE_CONFLICT_STATUS=OK" >> $GITHUB_ENV
       
       - name: ⏩ Merge stable with main, push main        
-        if: ${{ env.CAN_MERGE == true }}
+        if: env.MERGE_CONFLICT_STATUS == 'OK'
         run: | 
           git merge --abort
           git merge -S stable
           git push origin main
           
       - name: ⏭ Create pull request from stable to main
-        if: ${{ env.CAN_MERGE == false }}
+        if: env.MERGE_CONFLICT_STATUS == 'CONFLICT'
         uses: thomaseizinger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -7,6 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.21.23] - 2021-04-24
+
+cnbvvbnvbccnbv cvnbvbcnbvc
+
+cvbnvcbnnbvcnbv
+
+cvbnvbcnnbvcnbvc
+cnbvvbnvbccnbv cvnbvbcnbvc
+
+cvbnvcbnnbvcnbv
+
+cvbnvbcnnbvcnbvc
+cnbvvbnvbccnbv cvnbvbcnbvc
+
+cvbnvcbnnbvcnbv
+
+cvbnvbcnnbvcnbvc
+
+## [1.21.18] - 2021-04-24
+
+cnbvvbnvbccnbv
+cvnbvbcnbvc
+
+cvbnvcbnnbvcnbv
+
+cvbnvbcnnbvcnbvc
+
+## [1.21.15] - 2021-04-24
+
 asdfasdf asdf asdf asdf asdf
 
 ## [1.20.55] - 2021-04-24
@@ -201,7 +230,13 @@ more of that
 
 -   Something was added.
 
-[Unreleased]: https://github.com/bUnit-dev/workflows/compare/v1.20.55...HEAD
+[Unreleased]: https://github.com/bUnit-dev/workflows/compare/v1.21.23...HEAD
+
+[1.21.23]: https://github.com/bUnit-dev/workflows/compare/v1.21.18...v1.21.23
+
+[1.21.18]: https://github.com/bUnit-dev/workflows/compare/v1.21.15...v1.21.18
+
+[1.21.15]: https://github.com/bUnit-dev/workflows/compare/v1.20.55...v1.21.15
 
 [1.20.55]: https://github.com/bUnit-dev/workflows/compare/v1.20.52...v1.20.55