From 62a6b9d54e4e8a5be94f7d87527f3bf1b3bebeaa Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Mon, 4 Dec 2023 21:20:04 -0500 Subject: [PATCH] [CI] fix rebuilding on Jenkins paths between 20.04 and 22.04 were being reused and causing compile errors --- Jenkinsfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f8292d..5cc7876 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,13 +55,14 @@ pipeline cmake --version # Ubuntu 20.04 only ships cmake 3.16 not 3.17: echo 'PACKAGES="once:cmake ${PACKAGES}"' > local.cfg - ./candi.sh -j 10 -p $WORKSPACE - cp $WORKSPACE/tmp/build/deal.II-*/detailed.log detailed-ubuntu2004.log + rm -rf $WORKSPACE/install + ./candi.sh -j 10 -p $WORKSPACE/install + cp $WORKSPACE/install/tmp/build/deal.II-*/detailed.log detailed-ubuntu2004.log ''' archiveArtifacts artifacts: 'detailed-ubuntu2004.log', fingerprint: true sh '''#!/bin/bash - cd $WORKSPACE/tmp/build/deal.II-* && make test + cd $WORKSPACE/install/tmp/build/deal.II-* && make test ''' } } @@ -84,15 +85,15 @@ pipeline set -x mpicxx -v cmake --version - rm -rf $WORKSPACE/tmp/ rm -f local.cfg - ./candi.sh -j 10 -p $WORKSPACE - cp $WORKSPACE/tmp/build/deal.II-*/detailed.log detailed-ubuntu2204.log + rm -rf $WORKSPACE/install/ + ./candi.sh -j 10 -p $WORKSPACE/install + cp $WORKSPACE/install/tmp/build/deal.II-*/detailed.log detailed-ubuntu2204.log ''' archiveArtifacts artifacts: 'detailed-ubuntu2204.log', fingerprint: true sh '''#!/bin/bash - cd $WORKSPACE/tmp/build/deal.II-* && make test + cd $WORKSPACE/install/tmp/build/deal.II-* && make test ''' } } -- 2.39.5