From d481549931ca014ccd3455690bff0ca8470115a3 Mon Sep 17 00:00:00 2001 From: flavien Date: Tue, 10 Mar 2020 17:32:05 +0100 Subject: [PATCH 1/6] added jenkinsfile --- jenkinsfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 jenkinsfile diff --git a/jenkinsfile b/jenkinsfile new file mode 100644 index 0000000..0ff76ab --- /dev/null +++ b/jenkinsfile @@ -0,0 +1,23 @@ +pipeline { + agent any + + stages { + stage('build') { + steps { + sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation' + } + } + stage('run') { + steps { + sh 'ls' + } + } + } + post { + success { + archiveArtifacts artifacts: 'client.jar', fingerprint: true + archiveArtifacts artifacts: 'server.jar', fingerprint: true + archiveArtifacts artifacts: 'sources.tar.gz', fingerprint: false + } + } +} From 0a651d6ccfc9f789e54fe9161f30ccf67219f21e Mon Sep 17 00:00:00 2001 From: Louis Royer Date: Tue, 10 Mar 2020 17:34:07 +0100 Subject: [PATCH 2/6] Update --- jenkinsfile | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/jenkinsfile b/jenkinsfile index 0ff76ab..0642cb0 100644 --- a/jenkinsfile +++ b/jenkinsfile @@ -1,23 +1,31 @@ -pipeline { - agent any + pipeline { + agent any - stages { - stage('build') { - steps { - sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation' - } - } - stage('run') { - steps { - sh 'ls' - } - } - } - post { - success { - archiveArtifacts artifacts: 'client.jar', fingerprint: true - archiveArtifacts artifacts: 'server.jar', fingerprint: true - archiveArtifacts artifacts: 'sources.tar.gz', fingerprint: false - } - } -} + stages { + stage('build') { + steps { + sh 'mkdir bin' + sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation' + sh 'echo "BUILDING CLIENT"' + sh 'echo Main-Class: clientP2P/ClientP2P > MANIFEST.MF' + sh 'jar -cvmf MANIFEST.MF client.jar $(find . \( -iname "*.class" -and ! -iwholename "*/clientP2P/*.class" \) -type f)' + sh 'echo "BUILDING SERVER"' + sh 'echo Main-Class: javaProjet2020/Server > MANIFEST.MF' + sh 'jar -cvmf MANIFEST.MF server.jar $(find . \( -iname "*.class" -and ! -iwholename "*/serverP2P/*.class" \) -type f)' + sh 'tar -zcvf sources.tar.gz src/' + } + } + stage('run') { + steps { + sh 'ls' + } + } + } + post { + success { + archiveArtifacts artifacts: 'client.jar', fingerprint: true + archiveArtifacts artifacts: 'server.jar', fingerprint: true + archiveArtifacts artifacts: 'sources.tar.gz', fingerprint: true + } + } + } From 2a14d07c7dfa2889cfaa05c625c803651f259162 Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 10 Mar 2020 17:39:55 +0100 Subject: [PATCH 3/6] Rename to Jenkinsfile --- jenkinsfile => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkinsfile => Jenkinsfile (100%) diff --git a/jenkinsfile b/Jenkinsfile similarity index 100% rename from jenkinsfile rename to Jenkinsfile From 3c3b19a2e5f25a3235a8c7b6d7c336781a6b506b Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 10 Mar 2020 17:44:58 +0100 Subject: [PATCH 4/6] Fix escape \\ --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0642cb0..226dba2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,10 +8,10 @@ sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation' sh 'echo "BUILDING CLIENT"' sh 'echo Main-Class: clientP2P/ClientP2P > MANIFEST.MF' - sh 'jar -cvmf MANIFEST.MF client.jar $(find . \( -iname "*.class" -and ! -iwholename "*/clientP2P/*.class" \) -type f)' + sh 'jar -cvmf MANIFEST.MF client.jar $(find . \\( -iname "*.class" -and ! -iwholename "*/clientP2P/*.class" \\) -type f)' sh 'echo "BUILDING SERVER"' sh 'echo Main-Class: javaProjet2020/Server > MANIFEST.MF' - sh 'jar -cvmf MANIFEST.MF server.jar $(find . \( -iname "*.class" -and ! -iwholename "*/serverP2P/*.class" \) -type f)' + sh 'jar -cvmf MANIFEST.MF server.jar $(find . \\( -iname "*.class" -and ! -iwholename "*/serverP2P/*.class" \\) -type f)' sh 'tar -zcvf sources.tar.gz src/' } } From 11b063709b818d1e3e79d3ea338a2c1b14dcb364 Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 10 Mar 2020 18:28:31 +0100 Subject: [PATCH 5/6] Remote bin creation (file exists) --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 226dba2..034862a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,6 @@ stages { stage('build') { steps { - sh 'mkdir bin' sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation' sh 'echo "BUILDING CLIENT"' sh 'echo Main-Class: clientP2P/ClientP2P > MANIFEST.MF' From 8cee49394cc317c5d059611a666d0b0de6e0a0dd Mon Sep 17 00:00:00 2001 From: Louis Date: Tue, 10 Mar 2020 18:31:11 +0100 Subject: [PATCH 6/6] Add utf-8 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 034862a..3097b04 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ stages { stage('build') { steps { - sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation' + sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation -encoding UTF8' sh 'echo "BUILDING CLIENT"' sh 'echo Main-Class: clientP2P/ClientP2P > MANIFEST.MF' sh 'jar -cvmf MANIFEST.MF client.jar $(find . \\( -iname "*.class" -and ! -iwholename "*/clientP2P/*.class" \\) -type f)'