From 3a7ec4511de8d92308313df95369d3d409e81435 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 3 Oct 2020 15:24:29 +0200 Subject: [PATCH] Update Jenkinsfile and setup_workspace.sh --- Jenkinsfile | 14 ++++++++++++++ jenkins/scripts/setup_workspace.sh | 1 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10fddb7..96d3aed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,12 +21,26 @@ pipeline { } stages { stage("Compile C++") { + agent { + docker { + image 'dockcross/linux-x64' + args '-v $JAVA_HOME:/java -v $HOME:/var/maven' + reuseNode true + } + } steps { sh "./jenkins/scripts/compile.sh" } } stage("Build & Deploy SNAPSHOT") { + agent { + docker { + image 'maven:3.6.3' + args '-v $HOME:/var/maven' + reuseNode true + } + } steps { sh "mvn -s $MVN_SET -B deploy" } diff --git a/jenkins/scripts/setup_workspace.sh b/jenkins/scripts/setup_workspace.sh index ea0a406..2ea5e84 100755 --- a/jenkins/scripts/setup_workspace.sh +++ b/jenkins/scripts/setup_workspace.sh @@ -15,7 +15,6 @@ source ./jenkins/scripts/setup_variables.sh if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "Linux" - sudo apt install cmake -y elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then echo "OSX" elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then