Move on Drone, remove malware Jenkins
All checks were successful
continuous-integration/drone Build is passing
All checks were successful
continuous-integration/drone Build is passing
This commit is contained in:
parent
61a7b76096
commit
ee2d6486b4
3 changed files with 30 additions and 39 deletions
29
.drone.yml
Normal file
29
.drone.yml
Normal file
|
@ -0,0 +1,29 @@
|
|||
kind: pipeline
|
||||
type: docker
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: test
|
||||
image: maven:3-jdk-11
|
||||
commands:
|
||||
- mvn -B -DskipTests clean package
|
||||
volumes:
|
||||
- name: m2
|
||||
path: /root/.m2
|
||||
|
||||
- name: archive-artifact
|
||||
image: alpine:latest
|
||||
commands:
|
||||
- mkdir -p /builds/innaircbot
|
||||
- cp target/InnaIrcBot-*jar /builds/innaircbot/
|
||||
volumes:
|
||||
- name: builds
|
||||
path: /builds
|
||||
|
||||
volumes:
|
||||
- name: m2
|
||||
host:
|
||||
path: /home/docker/drone/files/m2
|
||||
- name: builds
|
||||
host:
|
||||
path: /home/www/builds
|
38
Jenkinsfile
vendored
38
Jenkinsfile
vendored
|
@ -1,38 +0,0 @@
|
|||
pipeline {
|
||||
agent {
|
||||
docker {
|
||||
image 'maven:3-alpine'
|
||||
args '-v /home/docker/jenkins/files/m2:/root/.m2 -v /home/docker/innaircbot/files/artifact:/rel'
|
||||
}
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Build') {
|
||||
steps {
|
||||
sh 'mvn -B -DskipTests clean package'
|
||||
}
|
||||
post {
|
||||
success {
|
||||
archiveArtifacts artifacts: 'target/*.jar, target/*.exe'
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Test') {
|
||||
steps {
|
||||
sh 'mvn test'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
junit 'target/surefire-reports/*.xml'
|
||||
}
|
||||
}
|
||||
}
|
||||
stage('Deploy') {
|
||||
steps {
|
||||
sh 'cp ./target/InnaIrcBot-*-jar-with-dependencies.jar /rel/InnaIrcBot.jar'
|
||||
// TODO: consider switch to docker registry
|
||||
// sh 'docker restart innaircbot'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -66,7 +66,7 @@ public class JoinFloodHandler implements EventHandler {
|
|||
return fistJoinTime;
|
||||
}
|
||||
private void kickBanUser(String user){
|
||||
StreamProvider.writeToStream(server,"PRIVMSG "+ channel +" :"+user+": join flood ("+ joinMaxNumber +" connections in "+timeFrameInSeconds+" seconds).\n");
|
||||
StreamProvider.writeToStream(server,"PRIVMSG "+ channel +" :"+user+": join flood ("+ joinMaxNumber +" connections in "+timeFrameInSeconds+" seconds).");
|
||||
StreamProvider.writeToStream(server,"MODE "+ channel +" +b "+user+"!*@*"); // TODO: consider other ban methods
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue