diff --git a/circle.yml b/circle.yml index bd1e5470..d6cf2890 100644 --- a/circle.yml +++ b/circle.yml @@ -1,11 +1,11 @@ machine: environment: - SPM_DIR: /home/ubuntu/opt/spm8/spm8_mcr/spm8 - SPM_MCR: /home/ubuntu/opt/spm8/spm8.sh + SPM_DIR: /home/ubuntu/opt/spm12/spm12_mcr/spm12 + SPM_MCR: /home/ubuntu/opt/spm12/spm12.sh dependencies: cache_directories: - - "~/opt/spm8" + - "~/opt/spm12" - "~/nilearn_data" pre: diff --git a/continuous_integration/install_spm12.sh b/continuous_integration/install_spm12.sh index e9dc5436..1c1a99e5 100644 --- a/continuous_integration/install_spm12.sh +++ b/continuous_integration/install_spm12.sh @@ -5,13 +5,13 @@ set -e SPM_ROOT_DIR=~/opt/spm12 # Installation directory -SPM_SRC=spm12_r6685.zip +SPM_SRC=spm12_r6914.zip MCRINST=MCRInstaller.bin mkdir -p $SPM_ROOT_DIR && cd $SPM_ROOT_DIR if [ ! -d spm12 ]; then - if [ ! -f ${SPM_SRC} ]; then + if [ ! -f ${SPM_SRC} ]; then wget http://www.fil.ion.ucl.ac.uk/spm/download/restricted/utopia/${SPM_SRC} fi unzip -q ${SPM_SRC} @@ -44,4 +44,3 @@ ${cmds} echo "You may want to add the following commands (the exports) to your ~/.bashrc file once and for all." echo echo ${cmds} - diff --git a/continuous_integration/setup_spm.sh b/continuous_integration/setup_spm.sh index 46acbb9a..a69d88ba 100644 --- a/continuous_integration/setup_spm.sh +++ b/continuous_integration/setup_spm.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -SPM_INSTALL_SCRIPT=continuous_integration/install_spm.sh +SPM_INSTALL_SCRIPT=continuous_integration/install_spm12.sh echo "" echo "SPM_INSTALL_SCRIPT: $SPM_INSTALL_SCRIPT" sudo bash $SPM_INSTALL_SCRIPT