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-02-28 20:58:53 +01:00
commit d884f0cbbd
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -18,3 +18,5 @@ classes/artifacts/Discord_Stroumpf_Beta_jar/
src/main/resources/templates/css src/main/resources/templates/css
src/main/resources/templates/js src/main/resources/templates/js
\.directory

5
Jenkinsfile vendored
View File

@ -2,7 +2,7 @@ node {
def app def app
stage('Clone') { // for display purposes stage('Clone') { // for display purposes
// Get some code from a GitHub repository // 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') { stage('Build image') {
/* This builds the actual image; synonymous to /* This builds the actual image; synonymous to
@ -15,10 +15,11 @@ node {
* First, the incremental build number from Jenkins * First, the incremental build number from Jenkins
* Second, the 'latest' tag. * Second, the 'latest' tag.
* Pushing multiple tags is cheap, as all the layers are reused. */ * Pushing multiple tags is cheap, as all the layers are reused. */
app.push("devel") app.push()
} }
stage('Cleaning'){ stage('Cleaning'){
sh "docker image prune -f" sh "docker image prune -f"
build job: 'Bot Discord javadoc', wait: false
} }
} }

6
README.md
View File

@ -1,5 +1,5 @@
# BrokenDiscordBot # BrokenDiscordBot
Master:<br/> [![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/master)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/master/) Master:<br/>[![Build Status](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/badge/icon)](https://jenkins.seb6596.ovh/job/Bot%20Discord%20Gradle/)
Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/devel)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/devel/) Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=BrokenDiscordBot/devel)](https://jenkins.seb6596.ovh/job/BrokenDiscordBot/job/devel/)
@ -70,6 +70,10 @@ Devel: <br/>[![Build Status](https://jenkins.seb6596.ovh/buildStatus/icon?job=Br
> ``` > ```
> Docker hub [repo](https://hub.docker.com/r/brokenfire/brokendiscordbot/) > 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 #### Jenkisfile
`git config --global merge.ours.driver true` `git config --global merge.ours.driver true`