chore: skip merge commit from changelog (#130)

containerbase · Oct 23, 2020 · 34848ee · 34848ee
1 parent 279229a
commit 34848ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -235,7 +235,7 @@ jobs:
       - name: Merge
         id: merge
         run: |
-          git merge --no-ff -m 'chore(release): merge (${{ github.sha }}) [skip release]' ${{ github.sha }}
+          git merge --no-ff -m 'skip: merge (${{ github.sha }}) [skip release]' ${{ github.sha }}
           commit=$(git rev-parse HEAD)
           echo "::set-output name=commit::${commit}"
 

diff --git a/.releaserc b/.releaserc
@@ -28,6 +28,10 @@
       {
         "type": "build",
         "release": "patch"
+      },
+      {
+        "type": "skip",
+        "release": false
       }
     ]
   },
@@ -81,6 +85,10 @@
       {
         "type": "ci",
         "section": "Continuous Integration"
+      },
+      {
+        "type": "skip",
+        "hidden": true
       }
     ]
   }