From a5ae4d5494100df2499f05c951abfd0076f97e61 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 18 Sep 2021 12:23:28 +0200 Subject: [PATCH] fix remote setting for minres conan repo --- Jenkinsfile | 100 +++++++++++++++++++++++++------------------------- conanfile.txt | 54 +++++++++++++-------------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e20e7c0..9e90f96 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,10 +28,10 @@ void checkout_hifive_vp() { void build_hifive_vp() { try { sh("conan profile new default --detect --force") - sh("conan profile update settings.compiler.libcxx=libstdc++11 default") - sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo --force") - sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force") - } + sh("conan profile update settings.compiler.libcxx=libstdc++11 default") + sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo --force") + sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force") + } catch (exc) { echo 'Conan configured' } @@ -39,70 +39,70 @@ void build_hifive_vp() { sh("mkdir -p HIFIVE1-VP/build-ubuntu") sh("cd HIFIVE1-VP && git submodule update --recursive") sh("cd HIFIVE1-VP/build-ubuntu && MAKE_FLAGS='-j4' cmake .. && make -j4") - fingerprint 'HIFIVE1-VP/build-ubuntu/bin/riscv.vp' + fingerprint 'HIFIVE1-VP/build-ubuntu/bin/riscv.vp' } void build_hifive_without_scv() { try { sh("conan profile new default --detect --force") - sh("conan profile update settings.compiler.libcxx=libstdc++11 default") - sh("conan remote add minres https://api.bintray.com/conan/minres/conan-repo --force") - sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force") - } + sh("conan profile update settings.compiler.libcxx=libstdc++11 default") + sh("conan remote add minres https://artifactory.minres.com/artifactory/api/conan/oss --force") + //sh("conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan --force") + } catch (exc) { - echo 'Conan configured' - } + echo 'Conan configured' + } sh("rm -rf HIFIVE1-VP/build-ubuntu") sh("mkdir -p HIFIVE1-VP/build-ubuntu") sh("cd HIFIVE1-VP && git submodule update --recursive") - sh("cd HIFIVE1-VP/build-ubuntu && MAKE_FLAGS='-j4' cmake .. -DENABLE_SCV=FALSE && make -j4") - fingerprint 'HIFIVE1-VP/build-ubuntu/bin/riscv.vp' + sh("cd HIFIVE1-VP/build-ubuntu && MAKE_FLAGS='-j4' cmake .. -DENABLE_SCV=FALSE && make -j4") + fingerprint 'HIFIVE1-VP/build-ubuntu/bin/riscv.vp' } pipeline { agent none - options { - // using the Timestamper plugin we can add timestamps to the console log - timestamps() - skipStagesAfterUnstable() - } + options { + // using the Timestamper plugin we can add timestamps to the console log + timestamps() + skipStagesAfterUnstable() + } stages { stage('HiFive-VP pipeline') { - parallel { - stage('ubuntu18'){ - agent {docker { image 'ubuntu-18.04' } } - stages { - stage('Checkout on Ubuntu18.04') { steps { checkout_hifive_vp() }} - stage('Build') { steps { build_hifive_vp() } } - } - } - stage('ubuntu20'){ - agent {docker { image 'ubuntu-20.04' } } - stages { - stage('Checkout on Ubuntu20.04') { steps { checkout_hifive_vp() }} - stage('Build') { steps { build_hifive_vp() } } - } - } - stage('Fedora28'){ - agent {docker { image 'fedora28' } } - stages { - stage('Checkout on Fedora') { steps {checkout_hifive_vp()}} - stage('Build') { steps {build_hifive_vp() }} - } - } - stage('No SCV'){ - agent {docker { image 'ubuntu-18.04' } } - stages { - stage('Checkout on Ubuntu') { steps {checkout_hifive_vp()}} - stage('Build without SCV') { steps {build_hifive_without_scv()} - } - } - } + parallel { + stage('ubuntu18'){ + agent {docker { image 'ubuntu-18.04' } } + stages { + stage('Checkout on Ubuntu18.04') { steps { checkout_hifive_vp() }} + stage('Build') { steps { build_hifive_vp() } } + } + } + stage('ubuntu20'){ + agent {docker { image 'ubuntu-20.04' } } + stages { + stage('Checkout on Ubuntu20.04') { steps { checkout_hifive_vp() }} + stage('Build') { steps { build_hifive_vp() } } + } + } + stage('Fedora28'){ + agent {docker { image 'fedora28' } } + stages { + stage('Checkout on Fedora') { steps {checkout_hifive_vp()}} + stage('Build') { steps {build_hifive_vp() }} + } + } + stage('No SCV'){ + agent {docker { image 'ubuntu-18.04' } } + stages { + stage('Checkout on Ubuntu') { steps {checkout_hifive_vp()}} + stage('Build without SCV') { steps {build_hifive_without_scv()} + } + } + } - } + } } - } + } } diff --git a/conanfile.txt b/conanfile.txt index 08bf79f..0927dce 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -6,8 +6,8 @@ systemc-cci/1.0.0 tcc/0.9.27 boost/1.75.0 - zlib/1.2.11 - + zlib/1.2.11 + [generators] cmake @@ -17,29 +17,29 @@ boost:fPIC=True boost:shared=False boost:header_only=False - boost:fPIC=True - boost:shared=True - boost:header_only=False - boost:without_context=True - boost:without_contract=True - boost:without_coroutine=True - boost:without_fiber=True - boost:without_graph=True - boost:without_graph_parallel=True - boost:without_iostreams=True - boost:without_json=True - boost:without_locale=True - boost:without_log=True - boost:without_math=True - boost:without_mpi=True - boost:without_nowide=True - boost:without_python=True - boost:without_random=True - boost:without_regex=True - boost:without_serialization=True - boost:without_stacktrace=True - boost:without_test=True - boost:without_timer=True - boost:without_type_erasure=True - boost:without_wave=True + boost:fPIC=True + boost:shared=True + boost:header_only=False + boost:without_context=True + boost:without_contract=True + boost:without_coroutine=True + boost:without_fiber=True + boost:without_graph=True + boost:without_graph_parallel=True + boost:without_iostreams=True + boost:without_json=True + boost:without_locale=True + boost:without_log=True + boost:without_math=True + boost:without_mpi=True + boost:without_nowide=True + boost:without_python=True + boost:without_random=True + boost:without_regex=True + boost:without_serialization=True + boost:without_stacktrace=True + boost:without_test=True + boost:without_timer=True + boost:without_type_erasure=True + boost:without_wave=True systemc-cci:shared=False