Skip to content

Commit

Permalink
fix(docs): fix missing parameter
Browse files Browse the repository at this point in the history
Additionally, parse commit title to skip other build targets if it starts
with ``docs:`` or ``docs(text):``.

FORCING commit to make sure that CircleCI workflow has not been broken.
  • Loading branch information
oesteban committed May 20, 2019
1 parent f42e674 commit 94b1111
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 3 deletions.
26 changes: 25 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ jobs:
- image: docker:18.01.0-ce-git
working_directory: /tmp/src/fmriprep
steps:
- checkout
- run:
name: Check whether build should be skipped
command: |
if [[ "$( git log --format='format:%s' -n 1 $CIRCLE_SHA1 | grep -i -E '^docs?(\(\w+\))?:' )" != "" ]]; then
echo "Only docs build"
circleci step halt
fi
- run:
name: Install parallel gzip and python3
command: |
Expand All @@ -21,7 +30,6 @@ jobs:
- docker-v3-
paths:
- /tmp/cache/docker.tar.gz
- checkout
- setup_remote_docker
- run:
name: Load Docker image layer cache
Expand Down Expand Up @@ -215,6 +223,10 @@ jobs:
name: Check whether build should be skipped
command: |
cd /home/circleci/src/fmriprep
if [[ "$( git log --format='format:%s' -n 1 $CIRCLE_SHA1 | grep -i -E '^docs?(\(\w+\))?:' )" != "" ]]; then
echo "Only docs build"
circleci step halt
fi
if [[ "$( git log --format=oneline -n 1 $CIRCLE_SHA1 | grep -i -E '\[skip[ _]?tests\]' )" != "" ]]; then
echo "Skipping pytest job"
circleci step halt
Expand Down Expand Up @@ -332,6 +344,10 @@ jobs:
name: Check whether build should be skipped
command: |
cd /home/circleci/src/fmriprep
if [[ "$( git log --format='format:%s' -n 1 $CIRCLE_SHA1 | grep -i -E '^docs?(\(\w+\))?:' )" != "" ]]; then
echo "Only docs build"
circleci step halt
fi
if [[ "$( git log --format=oneline -n 1 $CIRCLE_SHA1 | grep -i -E '\[skip[ _]?ds005\]' )" != "" ]]; then
echo "Skipping ds000005 build"
circleci step halt
Expand Down Expand Up @@ -482,6 +498,10 @@ jobs:
name: Check whether build should be skipped
command: |
cd /home/circleci/src/fmriprep
if [[ "$( git log --format='format:%s' -n 1 $CIRCLE_SHA1 | grep -i -E '^docs?(\(\w+\))?:' )" != "" ]]; then
echo "Only docs build"
circleci step halt
fi
if [[ "$( git log --format=oneline -n 1 $CIRCLE_SHA1 | grep -i -E '\[skip[ _]?ds054\]' )" != "" ]]; then
echo "Skipping ds000054 build"
circleci step halt
Expand Down Expand Up @@ -617,6 +637,10 @@ jobs:
name: Check whether build should be skipped
command: |
cd /home/circleci/src/fmriprep
if [[ "$( git log --format='format:%s' -n 1 $CIRCLE_SHA1 | grep -i -E '^docs?(\(\w+\))?:' )" != "" ]]; then
echo "Only docs build"
circleci step halt
fi
if [[ "$( git log --format=oneline -n 1 $CIRCLE_SHA1 | grep -i -E '\[skip[ _]?ds210\]' )" != "" ]]; then
echo "Skipping ds000210 build"
circleci step halt
Expand Down
5 changes: 3 additions & 2 deletions docs/workflows.rst
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,11 @@ Resampling BOLD runs onto standard spaces
from collections import OrderedDict
from fmriprep.workflows.bold import init_bold_std_trans_wf
wf = init_bold_std_trans_wf(
standard_spaces=OrderedDict([('MNI152Lin', {}),
('fsaverage', {'density': '10k'})]),
freesurfer=True,
mem_gb=3,
omp_nthreads=1,
standard_spaces=OrderedDict([('MNI152Lin', {}),
('fsaverage', {'density': '10k'})]),
)

This sub-workflow concatenates the transforms calculated upstream (see
Expand Down

0 comments on commit 94b1111

Please sign in to comment.