From f1b1c837515daadd03a66e8ea00c21317ff21aea Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 15 May 2019 21:55:03 -0400 Subject: [PATCH] Update circleci and semantic-release to handle `master` merges --- .circleci/config.yml | 5 ++--- .releaserc | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 .releaserc diff --git a/.circleci/config.yml b/.circleci/config.yml index 6bd6848a5..b6021b3a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -83,17 +83,16 @@ workflows: branches: ignore: - master - - react - feature/* - hotfix/* - # MERGE TO REACT + # MERGE TO MASTER cut_release: jobs: - build_and_test: filters: branches: - only: react + only: master - npm_publish: requires: - build_and_test diff --git a/.releaserc b/.releaserc deleted file mode 100644 index d28d4e777..000000000 --- a/.releaserc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "branch": "react" -}