Skip to content

Commit 952693e

Browse files
committed
fix(circle): reduce artifacts in circle and update output files to include MNI152NLin6Asym derivatives
1 parent f2fd50e commit 952693e

File tree

3 files changed

+76
-16
lines changed

3 files changed

+76
-16
lines changed

.circleci/config.yml

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -462,14 +462,20 @@ jobs:
462462
exit $?
463463
- run:
464464
name: Clean working directory
465-
when: always
465+
when: on_success
466466
command: |
467467
sudo chown $(id -un):$(id -gn) -R /tmp/ds005
468-
find /tmp/ds005/work -not -name "*.svg" -not -name "*.html" -not -name "*.rst" \
469-
-not -name "*.mat" -not -name "*.lta" -not -name "*.json" -not -name "*.txt" -not -name "*.pklz" -type f -delete
470-
find /tmp/ds005/work_partial -not -name "*.svg" -not -name "*.html" -not -name "*.rst" \
471-
-not -name "*.mat" -not -name "*.lta" -not -name "*.json" -not -name "*.txt" -not -name "*.pklz" -type f -delete
472-
# tar cf - work_partial/ | pigz -2 -p 2 > ds005_workdir.tar.gz && sudo rm -fr work work_partial
468+
sudo rm -rf /tmp/ds005/work
469+
sudo rm -rf /tmp/ds005/work_partial
470+
- run:
471+
name: Clean working directory
472+
when: on_fail
473+
command: |
474+
sudo chown $(id -un):$(id -gn) -R /tmp/ds005
475+
find /tmp/ds005/work \( -name "*.nii.gz" -or -name "*.nii" -or "*.gii" -or "*.h5" \) \
476+
-exec sh -c 'rm -f {}; touch {}' \;
477+
find /tmp/ds005/work_partial \( -name "*.nii.gz" -or -name "*.nii" -or "*.gii" -or "*.h5" \) \
478+
-exec sh -c 'rm -f {}; touch {}' \;
473479
474480
- store_artifacts:
475481
path: /tmp/ds005
@@ -588,13 +594,18 @@ jobs:
588594
set -e
589595
[[ "$RET" -eq "1" ]]
590596
- run:
591-
name: Clean-up work directory
592-
when: always
597+
name: Clean working directory
598+
when: on_success
599+
command: |
600+
sudo chown $(id -un):$(id -gn) -R /tmp/ds054
601+
sudo rm -rf /tmp/ds054/work
602+
- run:
603+
name: Clean working directory
604+
when: on_fail
593605
command: |
594606
sudo chown $(id -un):$(id -gn) -R /tmp/ds054
595-
find /tmp/ds054/work -not -name "*.svg" -not -name "*.html" -not -name "*.rst" \
596-
-not -name "*.mat" -not -name "*.lta" -not -name "*.json" -not -name "*.txt" -not -name "*.pklz" -type f -delete
597-
# tar cf - work/ | pigz -2 -p 2 > ds054_workdir.tar.gz && sudo rm -fr work
607+
find /tmp/ds054/work \( -name "*.nii.gz" -or -name "*.nii" -or "*.gii" -or "*.h5" \) \
608+
-exec sh -c 'rm -f {}; touch {}' \;
598609
- store_artifacts:
599610
path: /tmp/ds054
600611

@@ -686,13 +697,18 @@ jobs:
686697
diff /tmp/src/fmriprep/.circleci/ds210_outputs.txt /tmp/ds210/test/outputs.out
687698
exit $?
688699
- run:
689-
name: Clean-up work directory
690-
when: always
700+
name: Clean working directory
701+
when: on_success
702+
command: |
703+
sudo chown $(id -un):$(id -gn) -R /tmp/ds210
704+
sudo rm -rf /tmp/ds210/work
705+
- run:
706+
name: Clean working directory
707+
when: on_fail
691708
command: |
692709
sudo chown $(id -un):$(id -gn) -R /tmp/ds210
693-
find /tmp/ds210/work -not -name "*.svg" -not -name "*.html" -not -name "*.rst" \
694-
-not -name "*.mat" -not -name "*.lta" -not -name "*.json" -not -name "*.txt" -not -name "*.pklz" -type f -delete
695-
# tar cf - work/ | pigz -2 -p 2 > ds054_workdir.tar.gz && sudo rm -fr work
710+
find /tmp/ds210/work \( -name "*.nii.gz" -or -name "*.nii" -or "*.gii" -or "*.h5" \) \
711+
-exec sh -c 'rm -f {}; touch {}' \;
696712
- store_artifacts:
697713
path: /tmp/ds210
698714

.circleci/ds005_outputs.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.json
1717
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
1818
fmriprep/sub-01/anat/sub-01_dseg.nii.gz
1919
fmriprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
20+
fmriprep/sub-01/anat/sub-01_from-MNI152NLin6Asym_to-T1w_mode-image_xfm.h5
2021
fmriprep/sub-01/anat/sub-01_from-orig_to-T1w_mode-image_xfm.txt
2122
fmriprep/sub-01/anat/sub-01_from-T1w_to-fsnative_mode-image_xfm.txt
2223
fmriprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
24+
fmriprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin6Asym_mode-image_xfm.h5
2325
fmriprep/sub-01/anat/sub-01_hemi-L_inflated.surf.gii
2426
fmriprep/sub-01/anat/sub-01_hemi-L_midthickness.surf.gii
2527
fmriprep/sub-01/anat/sub-01_hemi-L_pial.surf.gii
@@ -39,6 +41,14 @@ fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dseg.nii.gz
3941
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
4042
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
4143
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
44+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-brain_mask.json
45+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-brain_mask.nii.gz
46+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-preproc_T1w.json
47+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-preproc_T1w.nii.gz
48+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_dseg.nii.gz
49+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-CSF_probseg.nii.gz
50+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-GM_probseg.nii.gz
51+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-WM_probseg.nii.gz
4252
fmriprep/sub-01/func
4353
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_AROMAnoiseICs.csv
4454
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_bold.dtseries.json
@@ -57,6 +67,14 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAs
5767
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.json
5868
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
5969
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
70+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_boldref.nii.gz
71+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-aparcaseg_dseg.nii.gz
72+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-aseg_dseg.nii.gz
73+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-brain_mask.json
74+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-brain_mask.nii.gz
75+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-preproc_bold.json
76+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-preproc_bold.nii.gz
77+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-MNI152NLin6Asym_desc-smoothAROMAnonaggr_bold.nii.gz
6078
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_boldref.nii.gz
6179
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-aparcaseg_dseg.nii.gz
6280
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-01_space-T1w_desc-aseg_dseg.nii.gz
@@ -81,6 +99,14 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAs
8199
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.json
82100
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
83101
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
102+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_boldref.nii.gz
103+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-aparcaseg_dseg.nii.gz
104+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-aseg_dseg.nii.gz
105+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-brain_mask.json
106+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-brain_mask.nii.gz
107+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-preproc_bold.json
108+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-preproc_bold.nii.gz
109+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-smoothAROMAnonaggr_bold.nii.gz
84110
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_boldref.nii.gz
85111
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aparcaseg_dseg.nii.gz
86112
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aseg_dseg.nii.gz

.circleci/ds005_partial_outputs.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.json
1717
fmriprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
1818
fmriprep/sub-01/anat/sub-01_dseg.nii.gz
1919
fmriprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
20+
fmriprep/sub-01/anat/sub-01_from-MNI152NLin6Asym_to-T1w_mode-image_xfm.h5
2021
fmriprep/sub-01/anat/sub-01_from-orig_to-T1w_mode-image_xfm.txt
2122
fmriprep/sub-01/anat/sub-01_from-T1w_to-fsnative_mode-image_xfm.txt
2223
fmriprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
24+
fmriprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin6Asym_mode-image_xfm.h5
2325
fmriprep/sub-01/anat/sub-01_hemi-L_inflated.surf.gii
2426
fmriprep/sub-01/anat/sub-01_hemi-L_midthickness.surf.gii
2527
fmriprep/sub-01/anat/sub-01_hemi-L_pial.surf.gii
@@ -39,6 +41,14 @@ fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_dseg.nii.gz
3941
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-CSF_probseg.nii.gz
4042
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-GM_probseg.nii.gz
4143
fmriprep/sub-01/anat/sub-01_space-MNI152NLin2009cAsym_label-WM_probseg.nii.gz
44+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-brain_mask.json
45+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-brain_mask.nii.gz
46+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-preproc_T1w.json
47+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_desc-preproc_T1w.nii.gz
48+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_dseg.nii.gz
49+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-CSF_probseg.nii.gz
50+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-GM_probseg.nii.gz
51+
fmriprep/sub-01/anat/sub-01_space-MNI152NLin6Asym_label-WM_probseg.nii.gz
4252
fmriprep/sub-01/func
4353
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_AROMAnoiseICs.csv
4454
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_bold.dtseries.json
@@ -57,6 +67,14 @@ fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAs
5767
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.json
5868
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-preproc_bold.nii.gz
5969
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin2009cAsym_desc-smoothAROMAnonaggr_bold.nii.gz
70+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_boldref.nii.gz
71+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-aparcaseg_dseg.nii.gz
72+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-aseg_dseg.nii.gz
73+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-brain_mask.json
74+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-brain_mask.nii.gz
75+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-preproc_bold.json
76+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-preproc_bold.nii.gz
77+
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-MNI152NLin6Asym_desc-smoothAROMAnonaggr_bold.nii.gz
6078
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_boldref.nii.gz
6179
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aparcaseg_dseg.nii.gz
6280
fmriprep/sub-01/func/sub-01_task-mixedgamblestask_run-02_space-T1w_desc-aseg_dseg.nii.gz

0 commit comments

Comments
 (0)