Skip to content

Commit 6b8cf27

Browse files
authored
Merge pull request #310 from pharindoko/fix/release-pipeline
Fix/release pipeline
2 parents 4879fdf + 40b34ce commit 6b8cf27

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git:
33
depth: false
44
language: node_js
55
env:
6-
- COMMITCOUNT="$(git log $(git describe --tags --abbrev=0)..HEAD --oneline|grep -iv 'revert' |grep -e 'fix(' -e 'feat(' | wc -l | awk '{print $1}')"
6+
- 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}')"
77
cache:
88
directories:
99
- ~/.npm
@@ -35,12 +35,15 @@ jobs:
3535
before_script: cd packages/server
3636
name: test-server
3737
- stage: release
38-
if: (type = push AND branch = master AND env(COMMITCOUNT) != 0)
38+
if: (type = push AND branch = master)
3939
before_script:
4040
- echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc 2> /dev/null
4141
- git remote add pub https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
4242
- git fetch pub master
4343
- git checkout master
4444
script:
45-
- make fake-credentials
46-
- make publish
45+
- if [ $COMMITCOUNT != 0 ]; then
46+
echo "########create new release########";
47+
make fake-credentials;
48+
make publish;
49+
fi

renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": ["config:base"],
3-
"baseBranches": ["dev"],
3+
"baseBranches": ["master"],
44
"automerge": true,
55
"packageRules": [{
66
"depTypeList": ["dependencies"],

0 commit comments

Comments
 (0)