File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -82,8 +82,11 @@ process() {
82
82
esac
83
83
git fetch > /dev/null
84
84
git diff-index --quiet HEAD -- || die " Dirty working copy"
85
- branch=$( git rev-parse --abbrev-ref HEAD)
86
- test " $branch " = " master" || die " Non-master branch: $branch "
85
+ currentBranch=$( git rev-parse --abbrev-ref HEAD)
86
+ upstreamBranch=$( git rev-parse --abbrev-ref --symbolic-full-name @{u})
87
+ remote=${upstreamBranch%/* }
88
+ defaultBranch=$( git remote show " $remote " | grep " HEAD branch" | sed ' s/.*: //' )
89
+ test " $currentBranch " = " $defaultBranch " || die " Non-default branch: $currentBranch "
87
90
git merge --ff --ff-only ' HEAD@{u}' > /dev/null ||
88
91
die " Cannot fast forward (local diverging?)"
89
92
# test "$(git rev-parse HEAD)" = "$(git rev-parse 'HEAD@{u}')" ||
@@ -124,7 +127,7 @@ language: java
124
127
jdk: openjdk8
125
128
branches:
126
129
only:
127
- - master
130
+ - $defaultBranch
128
131
- "/.*-[0-9]+\\\\ ..*/"
129
132
install: true
130
133
script: "$travisBuildScript "
You can’t perform that action at this time.
0 commit comments