File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -32,6 +32,7 @@ GH_OWNER = ENV['GH_OWNER'] || 'github'
32
32
GH_AUTHOR = ENV [ 'GH_AUTHOR' ]
33
33
DEB_PKG_NAME = 'github-backup-utils'
34
34
GH_BASE_BRANCH = ENV [ 'GH_BASE_BRANCH' ] || 'master'
35
+ GH_STABLE_BRANCH = ENV [ 'GH_STABLE_BRANCH' ] || 'stable'
35
36
36
37
CHANGELOG_TMPL = '' '<%= package_name %> (<%= package_version %>) UNRELEASED; urgency=medium
37
38
@@ -137,7 +138,7 @@ def beautify_changes(changes)
137
138
end
138
139
139
140
def changelog
140
- changes = `git log --pretty=oneline origin/stable ...origin/#{ GH_BASE_BRANCH } --reverse --grep "Merge pull request" | sort -t\# -k2` . lines . map ( &:strip )
141
+ changes = `git log --pretty=oneline origin/#{ GH_STABLE_BRANCH } ...origin/#{ GH_BASE_BRANCH } --reverse --grep "Merge pull request" | sort -t\# -k2` . lines . map ( &:strip )
141
142
raise 'Building the changelog failed' if $CHILD_STATUS != 0
142
143
143
144
changes
@@ -228,12 +229,12 @@ def push_release_branch(version)
228
229
end
229
230
230
231
def update_stable_branch
231
- `git checkout --quiet stable `
232
+ `git checkout --quiet #{ GH_STABLE_BRANCH } `
232
233
unless ( out = `git merge --quiet --ff-only origin/#{ GH_BASE_BRANCH } ` )
233
- warn "Merging #{ GH_BASE_BRANCH } into stable failed:\n \n #{ out } "
234
+ warn "Merging #{ GH_BASE_BRANCH } into #{ GH_STABLE_BRANCH } failed:\n \n #{ out } "
234
235
end
235
- unless ( out = `git push --quiet origin stable ` )
236
- warn "Failed pushing the stable branch:\n \n #{ out } "
236
+ unless ( out = `git push --quiet origin #{ GH_STABLE_BRANCH } ` )
237
+ warn "Failed pushing the #{ GH_STABLE_BRANCH } branch:\n \n #{ out } "
237
238
end
238
239
end
239
240
You can’t perform that action at this time.
0 commit comments