Skip to content

Commit

Permalink
[CI] fix rebuilding on Jenkins
Browse files Browse the repository at this point in the history
paths between 20.04 and 22.04 were being reused and causing compile
errors
  • Loading branch information
tjhei committed Dec 5, 2023
1 parent dc8e8d3 commit d71a471
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/candi
./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
'''
}
}
Expand All @@ -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
'''
}
}
Expand Down

0 comments on commit d71a471

Please sign in to comment.