diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aea063f..8d30c8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release CI on: push: branches: - - main + - master jobs: release: diff --git a/.releaserc b/.releaserc index db49e12..b601d43 100644 --- a/.releaserc +++ b/.releaserc @@ -1,4 +1,36 @@ { +<<<<<<< HEAD + "branch": "master", + "tagFormat": "v${version}", + "verifyConditions": [ + { + "path": "@semantic-release/npm", + "pkgRoot": "dist" + }, + { + "path": "@semantic-release/github" + } + ], + "analyzeCommits": "@semantic-release/commit-analyzer", + "generateNotes": "@semantic-release/release-notes-generator", + "prepare": [ + { + "path": "@semantic-release/npm", + "pkgRoot": "dist" + } + ], + "publish": [ + { + "path": "@semantic-release/npm", + "pkgRoot": "dist" + }, + { + "path": "@semantic-release/github" + } + ], + "success": [], + "fail": [] +======= "branches": ["main", "next"], "plugins": [ "@semantic-release/commit-analyzer", @@ -6,4 +38,5 @@ "@semantic-release/npm", "@semantic-release/github" ] +>>>>>>> 9778bfab4b5763f12a149123cb133211e736fc82 } diff --git a/package.json b/package.json index 11cffb7..19298cb 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "React toolkit for writing and testing react components", "main": "dist/index.js", "release": { - "branches": ["main", "next"] + "branches": ["master"] }, "files": [ "/dist" diff --git a/src/testUtils/shallow.jsx b/src/testUtils/shallow.jsx index 0e11519..dae411e 100644 --- a/src/testUtils/shallow.jsx +++ b/src/testUtils/shallow.jsx @@ -63,7 +63,7 @@ class ReactShallowRenderer { isEmptyRender() { const data = this.getRenderOutput(); - return data === null; + return data === nul || data === false; } get snapshot() {