Merge branch 'master' into devel
This commit is contained in:
commit
ad843f4245
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -1,2 +1,2 @@
|
||||
Jenkinsfile merge=ours
|
||||
Dockerfile merge=ours
|
||||
|
||||
|
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -2,7 +2,7 @@ node {
|
||||
def app
|
||||
stage('Clone') { // for display purposes
|
||||
// Get some code from a GitHub repository
|
||||
git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git', branch: 'devel'
|
||||
git url: 'https://github.com/BrokenFire/BrokenDiscordBot.git'
|
||||
}
|
||||
stage('Gradle Buil'){
|
||||
build job: 'Bot Discord Gradle', wait: true
|
||||
@ -18,7 +18,7 @@ node {
|
||||
* First, the incremental build number from Jenkins
|
||||
* Second, the 'latest' tag.
|
||||
* Pushing multiple tags is cheap, as all the layers are reused. */
|
||||
app.push("devel")
|
||||
app.push()
|
||||
|
||||
}
|
||||
stage('Cleaning'){
|
||||
|
Loading…
Reference in New Issue
Block a user