Skip to content

Use SPM12 instead of SPM8 in continuous integration #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrahim merged 3 commits into from
Apr 23, 2017
Merged

Use SPM12 instead of SPM8 in continuous integration #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c87e77e
spm12 integration
mrahim Apr 22, 2017
74992ae
spm12 integration
mrahim Apr 22, 2017
ffab51b
spm12 integration
mrahim Apr 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 2 additions & 3 deletions continuous_integration/install_spm12.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}

2 changes: 1 addition & 1 deletion continuous_integration/setup_spm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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