diff --git a/Jenkinsfile b/Jenkinsfile index 0d2964d..f7350f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,14 +16,14 @@ void checkout_project() { ]) } -void setup_conan_centos() { +void setup_conan_stdc() { sh""" conan profile new default --detect --force conan profile update settings.compiler.libcxx=libstdc++ default """ } -void setup_conan_ubuntu() { +void setup_conan_stdc11() { sh""" conan profile new default --detect --force conan profile update settings.compiler.libcxx=libstdc++11 default @@ -57,7 +57,7 @@ pipeline { agent {docker { image 'ubuntu-18.04' } } stages { stage('Ubuntu18.04: checkout') { steps { checkout_project() }} - stage('Ubuntu18.04: Conan') { steps { setup_conan_ubuntu() }} + stage('Ubuntu18.04: Conan') { steps { setup_conan_stdc11() }} stage('Ubuntu18.04: Build') { steps { build_project() }} stage('Ubuntu18.04: Test') { steps { test_project() }} } @@ -66,7 +66,7 @@ pipeline { agent {docker { image 'ubuntu-20.04' } } stages { stage('Ubuntu20.04: checkout') { steps { checkout_project() }} - stage('Ubuntu20.04: Conan') { steps { setup_conan_ubuntu() }} + stage('Ubuntu20.04: Conan') { steps { setup_conan_stdc11() }} stage('Ubuntu20.04: Build') { steps { build_project() }} stage('Ubuntu20.04: Test') { steps { test_project() }} } @@ -75,7 +75,7 @@ pipeline { agent {docker { image 'centos7' } } stages { stage('CentOS7: checkout') { steps { checkout_project() }} - stage('CentOS7: conan') { steps { setup_conan_centos() }} + stage('CentOS7: conan') { steps { setup_conan_stdc() }} stage('CentOS7: build') { steps { build_project() }} stage('CentOS7: test') { steps { test_project() }} } @@ -84,7 +84,7 @@ pipeline { agent {docker { image 'centos8' } } stages { stage('CentOS8: checkout') { steps { checkout_project() }} - stage('CentOS8: conan') { steps { setup_conan_centos() }} + stage('CentOS8: conan') { steps { setup_conan_stdc11() }} stage('CentOS8: build') { steps { build_project() }} stage('CentOS8: test') { steps { test_project() }} }