Update circleci and semantic-release to handle master merges
This commit is contained in:
1 parent
d69b014721
commit
f1b1c83751
2 files changed
+2
-6
No files matched your search
@@ -83,17 +83,16 @@ workflows:
|
|||||||
branches:
|
branches:
|
||||||
ignore:
|
ignore:
|
||||||
- master
|
- master
|
||||||
- react
|
|
||||||
- feature/*
|
- feature/*
|
||||||
- hotfix/*
|
- hotfix/*
|
||||||
|
|
||||||
# MERGE TO REACT
|
# MERGE TO MASTER
|
||||||
cut_release:
|
cut_release:
|
||||||
jobs:
|
jobs:
|
||||||
- build_and_test:
|
- build_and_test:
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: react
|
only: master
|
||||||
- npm_publish:
|
- npm_publish:
|
||||||
requires:
|
requires:
|
||||||
- build_and_test
|
- build_and_test
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
{
|
|
||||||
"branch": "react"
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user