Skip to content

Commit

Permalink
build: fix semantic release git plugin and remove accidentally commit…
Browse files Browse the repository at this point in the history
…ted node_modules (cypress-io#8850)
  • Loading branch information
panzarino authored Oct 15, 2020
1 parent 1ac7c49 commit 0a8e38e
Show file tree
Hide file tree
Showing 181 changed files with 3 additions and 56,805 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/merge-master-into-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ jobs:
pr_body: |
There was a merge conflict when trying to automatically merge master into develop. Please resolve the conflict and complete the merge.
DO NOT SQUASH AND MERGE
@${{ github.actor }}
pr_reviewer: ${{ github.actor }}
pr_label: "auto-merge"
Expand Down
2 changes: 1 addition & 1 deletion .releaserc.base.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
}],
['@semantic-release/git', {
assets: [
'**/CHANGELOG.md',
'./CHANGELOG.md',
],
message: 'chore: release ${nextRelease.gitTag}\n\n[skip ci]',
}],
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 0a8e38e

Please sign in to comment.