mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-26 11:51:02 +00:00
Merge branch 'master' into feature/svg-badges
This commit is contained in:
commit
2561d3a6db
1 changed files with 7 additions and 2 deletions
|
@ -23,6 +23,11 @@ func (g *Git) Write(f *buildfile.Buildfile) {
|
|||
// add target as a git remote
|
||||
f.WriteCmd(fmt.Sprintf("git remote add deploy %s", g.Target))
|
||||
|
||||
destinationBranch := g.Branch
|
||||
if destinationBranch == "" {
|
||||
destinationBranch = "master"
|
||||
}
|
||||
|
||||
switch g.Force {
|
||||
case true:
|
||||
// this is useful when the there are artifacts generated
|
||||
|
@ -30,9 +35,9 @@ func (g *Git) Write(f *buildfile.Buildfile) {
|
|||
// that need to be deployed to git remote.
|
||||
f.WriteCmd(fmt.Sprintf("git add -A"))
|
||||
f.WriteCmd(fmt.Sprintf("git commit -m 'add build artifacts'"))
|
||||
f.WriteCmd(fmt.Sprintf("git push deploy $COMMIT:master --force"))
|
||||
f.WriteCmd(fmt.Sprintf("git push deploy $COMMIT:%s --force", destinationBranch))
|
||||
case false:
|
||||
// otherwise we just do a standard git push
|
||||
f.WriteCmd(fmt.Sprintf("git push deploy $COMMIT:master"))
|
||||
f.WriteCmd(fmt.Sprintf("git push deploy $COMMIT:%s", destinationBranch))
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue