diff --git a/.circleci/config.yml b/.circleci/config.yml index 54c0684cf..804ac9da9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,8 +75,8 @@ jobs: - run: git config --global user.name "contentful-ecosystem-bot" - yarn_install - run: yarn build - - run: yarn lerna version --no-private --conventional-commits --conventional-prerelease --create-release github --yes - - run: yarn lerna publish from-git --yes --dist-tag next + - run: yarn lerna version --no-private --conventional-commits --create-release github --yes + - run: yarn lerna publish from-git --yes workflows: version: 2 @@ -89,9 +89,7 @@ workflows: - release: filters: branches: - only: - - master - - next + only: master requires: - lint - unit-tests diff --git a/lerna.json b/lerna.json index 14a4bf6a4..b0d1d9e17 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "workspaces": ["packages/**", "extensions/**"], "command": { "version": { - "allowBranch": ["master", "next"], + "allowBranch": "master", "conventionalCommits": true, "message": "chore(release): updated release notes and package versions [ci skip]", "ignoreChanges": [ diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json index f23e3d083..03982a07c 100644 --- a/packages/rich-text/package.json +++ b/packages/rich-text/package.json @@ -54,8 +54,5 @@ "@babel/preset-env": "7.12.11", "@babel/preset-react": "7.13.13", "@contentful/rich-text-react-renderer": "^14.1.3" - }, - "publishConfig": { - "tag": "next" } }