othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update circleci and semantic-release to handle master merges

Browse Source
This commit is contained in:
dannyrb 2019-05-15 21:55:03 -04:00
parent d69b014721
commit f1b1c83751
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.circleci/config.yml
View File

@ -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

3
.releaserc
View File

@ -1,3 +0,0 @@
{
"branch": "react"
}