diff --git a/.gitattributes b/.gitattributes index 3c8fdee..6428bbf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ Jenkinsfile merge=ours -Dockerfile merge=ours + diff --git a/Jenkinsfile b/Jenkinsfile index 696ca4b..1a3f52a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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'){