From 3f88e8e09ab1837b94e9919039a5f64712f02dc6 Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 13:14:52 +0100 Subject: [PATCH 1/8] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 45030f6..0e57dd5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,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'){ From 4efad49146c40e7a1e3eac218c2d684c735d6631 Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 18:44:33 +0100 Subject: [PATCH 2/8] Change DockerHub repo --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e57dd5..012b398 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,14 +8,14 @@ node { /* This builds the actual image; synonymous to * docker build on the command line */ - app = docker.build("brokenfire/testjenkins","--rm=true .") + app = docker.build("brokenfire/brokendiscordbot","--rm=true .") } stage('Push image') { /* Finally, we'll push the image with two tags: * First, the incremental build number from Jenkins * Second, the 'latest' tag. * Pushing multiple tags is cheap, as all the layers are reused. */ - app.push() + app.push() } stage('Cleaning'){ From 4bcb08442746cdf18ddb09878ebad061ae36f47a Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 19:48:56 +0100 Subject: [PATCH 3/8] Add build pull --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 012b398..1e7a40c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,7 @@ node { * Second, the 'latest' tag. * Pushing multiple tags is cheap, as all the layers are reused. */ app.push() + app.push("${env.BUILD_NUMBER}") } stage('Cleaning'){ From e2b76e47b394c790dc38f17430e14080f34ca870 Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 19:58:15 +0100 Subject: [PATCH 4/8] Add full clean on Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e7a40c..5fe270d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,10 +16,10 @@ node { * Second, the 'latest' tag. * Pushing multiple tags is cheap, as all the layers are reused. */ app.push() - app.push("${env.BUILD_NUMBER}") + app.push("${env.BUILD_NUMBER}") } stage('Cleaning'){ - sh "docker image prune -f" + sh "docker image prune -f -a" } } From b988fc2c591433683f7e5f9760aba9280fbaf01c Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 19:58:15 +0100 Subject: [PATCH 5/8] Revert "Add full clean on Jenkinsfile" This reverts commit e2b76e47b394c790dc38f17430e14080f34ca870. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5fe270d..1e7a40c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,10 +16,10 @@ node { * Second, the 'latest' tag. * Pushing multiple tags is cheap, as all the layers are reused. */ app.push() - app.push("${env.BUILD_NUMBER}") + app.push("${env.BUILD_NUMBER}") } stage('Cleaning'){ - sh "docker image prune -f -a" + sh "docker image prune -f" } } From 3856c6ca79e19d51457876de7c8bb280e65efefd Mon Sep 17 00:00:00 2001 From: BrokenFire Date: Sun, 18 Feb 2018 20:20:52 +0100 Subject: [PATCH 6/8] - --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e7a40c..012b398 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,6 @@ node { * Second, the 'latest' tag. * Pushing multiple tags is cheap, as all the layers are reused. */ app.push() - app.push("${env.BUILD_NUMBER}") } stage('Cleaning'){ From c5bfbc387fd32b3cb0b63df11a179f5717101fde Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 28 Feb 2018 20:45:16 +0100 Subject: [PATCH 7/8] Auto stash before merge of "master" and "devel" --- .gitignore | 2 ++ Jenkinsfile | 1 + 2 files changed, 3 insertions(+) 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 012b398..4c94390 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,5 +20,6 @@ node { } stage('Cleaning'){ sh "docker image prune -f" + build job: 'Bot Discord javadoc', wait: false } } From 23a93b81ef1ee8faee525b53892abdd28a50f783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cl=C3=A9ment?= Date: Wed, 28 Feb 2018 20:56:48 +0100 Subject: [PATCH 8/8] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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`