sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Sebastien 2018-03-01 12:56:04 +01:00
commit ad843f4245
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1,2 +1,2 @@
Jenkinsfile merge=ours
Dockerfile merge=ours

4
Jenkinsfile vendored
View File

@ -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'){