Merge pull request #78 from devlinjunker/release-1.7

release-1.7
devlinjunker · Dec 16, 2020 · 4e380d4 · 4e380d4
2 parents 7bc66ed + 8c38db6
commit 4e380d4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/hotfix-cut.yml b/.github/workflows/hotfix-cut.yml
@@ -38,8 +38,8 @@ jobs:
         NEW=`echo "
         $RELEASE_NAME
         -----------------
-        $CHANGELOG
-        
+        - 
+
         "`;
         echo "$NEW$([ -f CHANGELOG.md ] && less CHANGELOG.md)" > CHANGELOG.md;
         git commit -a -m "update version for $HOTFIX_BRANCH";
@@ -58,8 +58,6 @@ jobs:
         destination_branch: "main" 
         pr_title: hotfix-${{ steps.version.outputs.major }}.${{ steps.version.outputs.minor }}.${{ steps.next_version.outputs.patch }}
         pr_allow_empty: true
-        pr_body: |
-        # TODO:
-        - [ ] Update CHANGELOG.md
+        pr_body: "- [ ] Update CHANGELOG.md"
 
       # pr_label: release
diff --git a/.github/workflows/release-cut.yaml b/.github/workflows/release-cut.yaml
@@ -41,6 +41,8 @@ jobs:
         $RELEASE_NAME
         -----------------
         $CHANGELOG
+
+        
         "`;
         echo "$NEW$([ -f CHANGELOG.md ] && less CHANGELOG.md)" > CHANGELOG.md;
         git add CHANGELOG.md;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,20 +1,32 @@
 
+release-1.7.0
+-----------------
+- feat:fix
+
+
 release-1.6.0
 -----------------
 - feat: fix
 
+
 release-1.5.4
 -----------------
 - fix: try to use |
 
+
 release-1.5.3
 -----------------
 - fix: try to use %0A
 
+
 release-1.5.1
 -----------------
+
+
 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.6.0
+Version: 1.7.0
 ---
 
 # Test Github Actions