Update circleci and semantic-release to handle master merges

2019-05-15 21:55:03 -04:00 · 2019-05-15 21:55:03 -04:00 · f1b1c83751
commit f1b1c83751
parent d69b014721
2 changed files with 2 additions and 6 deletions
--- 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
--- a/.releaserc
+++ b/.releaserc
@ -1,3 +0,0 @@
-{
-  "branch": "react"
-}