diff --git a/.travis.yml b/.travis.yml index ca0aaa26..e12a8f05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ git: depth: false language: node_js env: - - COMMITCOUNT="$(git log $(git describe --tags --abbrev=0)..HEAD --oneline|grep -iv 'revert' |grep -e 'fix(' -e 'feat(' | wc -l | awk '{print $1}')" + - COMMITCOUNT="$(git log $(git describe --tags --abbrev=0)..HEAD --oneline|grep -iv 'revert' |grep -e 'fix(' -e 'feat(' -e 'fix:' -e 'feat:' | wc -l | awk '{print $1}')" cache: directories: - ~/.npm @@ -35,12 +35,15 @@ jobs: before_script: cd packages/server name: test-server - stage: release - if: (type = push AND branch = master AND env(COMMITCOUNT) != 0) + if: (type = push AND branch = master) before_script: - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc 2> /dev/null - git remote add pub https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git - git fetch pub master - git checkout master script: - - make fake-credentials - - make publish \ No newline at end of file + - if [ $COMMITCOUNT != 0 ]; then + echo "########create new release########"; + make fake-credentials; + make publish; + fi \ No newline at end of file diff --git a/renovate.json b/renovate.json index ccb5376b..ff0040c3 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "extends": ["config:base"], - "baseBranches": ["dev"], + "baseBranches": ["master"], "automerge": true, "packageRules": [{ "depTypeList": ["dependencies"],