diff --git a/.gitignore b/.gitignore index b66cef7..6b41cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ classes/artifacts/Discord_Stroumpf_Beta_jar/ src/main/resources/templates/css src/main/resources/templates/js + +\.directory diff --git a/Jenkinsfile b/Jenkinsfile index fbd958c..4c94390 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,12 +2,12 @@ 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 'https://github.com/BrokenFire/BrokenDiscordBot.git' } stage('Build image') { /* This builds the actual image; synonymous to * docker build on the command line */ - + app = docker.build("brokenfire/brokendiscordbot","--rm=true .") } stage('Push image') { @@ -15,10 +15,11 @@ 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'){ sh "docker image prune -f" + build job: 'Bot Discord javadoc', wait: false } -} \ No newline at end of file +} diff --git a/README.md b/README.md index 524ffd8..2194777 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # BrokenDiscordBot -Master:
[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/master)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/master/) +Master:
[![Build Status](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/badge/icon)](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/) Devel:
[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/devel)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/devel/) @@ -70,6 +70,10 @@ Devel:
[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br > ``` > Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) +### [Javadoc](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/javadoc/) + +### [Jenkins](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/) + #### Jenkisfile `git config --global merge.ours.driver true`