Merge pull request #73 from devlinjunker/hotfix-1.5.1

Hotfix-1.5.1
devlinjunker · Dec 16, 2020 · a4b8e30 · a4b8e30
2 parents f48f700 + 7d3250e
commit a4b8e30
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/hotfix-cut.yml b/.github/workflows/hotfix-cut.yml
@@ -56,10 +56,10 @@ jobs:
         source_branch: hotfix-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}
         destination_branch: "main" 
         pr_title: hotfix-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}
+        pr_allow_empty: true
         pr_body: "
         # TODO: 
-        - [ ] Update CHANGELOG.mc
+        - [ ] Update CHANGELOG.md
         "
 
-
       # pr_label: release
diff --git a/.github/workflows/release-cut.yaml b/.github/workflows/release-cut.yaml
@@ -44,7 +44,7 @@ jobs:
         "`;
         echo "$NEW$([ -f CHANGELOG.md ] && less CHANGELOG.md)" > CHANGELOG.md;
         git add CHANGELOG.md;
-        git commit -m "update CHANGELOG before $RELEASE";
+        git commit -m "update CHANGELOG before $RELEASE_NAME";
         git push;
       env:
         RELEASE_NAME: release-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.version.outputs.patch }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+release-1.5.0
+-----------------
 release-1.5.0
 -----------------
 - feature: try to update changelog in release cut and hotfix cut
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ---
-Version: 1.5.0
+Version: 1.5.1
 ---
 
 # Test Github Actions