diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build index 8acdbf7..6db8352 100644 --- a/jenkins/cloudbees_build +++ b/jenkins/cloudbees_build @@ -72,6 +72,6 @@ make distclean all make runtests ########################################### -# Create distribution +# Create cache tar --exclude=test* -czf normativeTypes.CB-dist.tar.gz lib include diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc index e69c5c8..c5d593c 100644 --- a/jenkins/cloudbees_doc +++ b/jenkins/cloudbees_doc @@ -21,14 +21,7 @@ installE4 () { local module=$1 local branch=$2 - # If microbench version does not exist, try without - if [ "${MB}" = "WITH_MICROBENCH" ]; then - if wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=WITH_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz; then - wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz - fi - else - wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz - fi + wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz tar -xzf ${module}.CB-dist.tar.gz } @@ -38,7 +31,6 @@ installE4 () { BASE=3.15.4 PUBLISH=${PUBLISH:-NO} BRANCH=${BRANCH:-master} -MB=NO_MICROBENCH ########################################### # Fetch and unpack dependencies