Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit 8734f4f

Browse files
committed
Fix travis and jenkins CI
- python2 needs to be unlinked explicitly - added update: true in travis.yml file to fix failling macos builds - load boost also in the jenkins gpu builds
1 parent 50e92ca commit 8734f4f

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,18 @@ addons:
9999
- flex
100100
- openmpi
101101
- boost
102+
update: true
102103

103104
#=============================================================================
104105
# Set up environments
105106
#=============================================================================
106107
before_install:
107108
# brew installed flex and bison is not in $PATH
109+
# unlink python2 and use python3 as it's required for nmodl
108110
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
109111
export PATH=/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH;
112+
brew unlink python@2;
113+
brew link --overwrite python;
110114
fi
111115
# when python 3.6.7 is required, ex. NMODL in linux
112116
- if [ -n "$PYTHON_VERSION" ]; then

tests/jenkins/install_coreneuron.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source ${JENKINS_DIR:-.}/_env_setup.sh
77
CORENRN_TYPE="$1"
88

99
if [ "${CORENRN_TYPE}" = "GPU-non-unified" ] || [ "${CORENRN_TYPE}" = "GPU-unified" ]; then
10-
module load pgi/19.4 cuda hpe-mpi cmake
10+
module load pgi/19.4 cuda hpe-mpi cmake boost
1111

1212
mkdir build_${CORENRN_TYPE}
1313
else

0 commit comments

Comments
 (0)