Merge pull request #765 from nipreps/ci/1.3.x/update_circle

CI: Update CircleCI from master

Author: effigies

.circleci/config.yml

@@ -18,6 +18,7 @@ jobs:
             - build-v1-{{ .Branch }}-{{ .Revision }}
             - build-v1--{{ .Revision }}
             - build-v1-{{ .Branch }}-
+            - build-v1-maint/1.3.x-
             - build-v1-master-
             - build-v1-
           paths:
@@ -97,26 +98,28 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - env-v1-{{ .Branch }}-
-            - env-v1-master-
-            - env-v1-
+            - env-v2-{{ .Branch }}-
+            - env-v2-maint/1.3.x-
+            - env-v2-master-
+            - env-v2-
       - run:
           name: Setup git-annex, DataLad & TemplateFlow
           command: |
-            conda install -y -c anaconda -c conda-forge git-annex datalad wget
-            python -m pip install --no-cache-dir -U datalad-osf
+            apk update && apk add --no-cache coreutils
+            conda install -y -c conda-forge python=*=*cpython datalad git wget
+            python -m pip install --no-cache-dir -U datalad-osf templateflow
             git config --global user.name 'NiPreps Bot'
             git config --global user.email '[email protected]'
-            python -m pip install --no-cache-dir -U templateflow
       - save_cache:
-          key: env-v1-{{ .Branch }}-{{ .BuildNum }}
+          key: env-v2-{{ .Branch }}-{{ .BuildNum }}
           paths:
             - /opt/conda
 
       - restore_cache:
           keys:
             - data-v3-{{ .Branch }}-{{ epoch }}
             - data-v3-{{ .Branch }}-
+            - data-v3-maint/1.3.x-
             - data-v3-master-
             - data-v3-
       - run:
@@ -128,6 +131,15 @@ jobs:
             datalad update -r --merge -d ds000003/
             datalad get -J 2 -r -d ds000003/ ds000003/*
 
+      - run:
+          name: Get test data from ds000030
+          command: |
+            if [[ ! -d ds000030 ]]; then
+              datalad install -r https://github.com/nipreps-data/ds000030.git
+            fi
+            datalad update -r --merge -d ds000030/
+            datalad get -J 2 -r -d ds000030/ ds000030/sub-10228/func/*
+
       - run:
           name: Get BIDS test data stub
           command: |
@@ -143,6 +155,7 @@ jobs:
          key: data-v3-{{ .Branch }}-{{ epoch }}
          paths:
             - /tmp/data/ds000003
+            - /tmp/data/ds000030
             - /tmp/data/BIDS-examples-1-enh-ds054
       - run:
           name: Store FreeSurfer license file
@@ -177,6 +190,7 @@ jobs:
           keys:
             - mask-regressions-v0-{{ .Branch }}-{{ .Revision }}-
             - mask-regressions-v0-{{ .Branch }}-
+            - mask-regressions-v0-maint/1.3.x-
             - mask-regressions-v0-master-
             - mask-regressions-v0-
             - mask-regressions-
@@ -214,10 +228,6 @@ jobs:
       - restore_cache:
           keys:
             - build-v1-{{ .Branch }}-{{ .Revision }}
-            - build-v1--{{ .Revision }}
-            - build-v1-{{ .Branch }}-
-            - build-v1-master-
-            - build-v1-
       - run:
           name: Docker authentication
           command: |
@@ -245,9 +255,6 @@ jobs:
       - restore_cache:
           keys:
             - data-v3-{{ .Branch }}-{{ epoch }}
-            - data-v3-{{ .Branch }}-
-            - data-v3-master-
-            - data-v3-
 
       - run:
           name: Run unit tests
@@ -329,14 +336,10 @@ jobs:
       - restore_cache:
           keys:
             - mask-regressions-v0-{{ .Branch }}-{{ .Revision }}-
-            - mask-regressions-v0-{{ .Branch }}-
 
       - restore_cache:
           keys:
             - build-v1-{{ .Branch }}-{{ epoch }}
-            - build-v1-{{ .Branch }}-
-            - build-v1-master-
-            - build-v1-
       - run:
           name: Docker authentication
           command: |
@@ -366,6 +369,7 @@ jobs:
           keys:
             - masks-workdir-v3-{{ .Branch }}-{{epoch}}
             - masks-workdir-v3-{{ .Branch }}-
+            - masks-workdir-v3-maint/1.3.x-
             - masks-workdir-v3-master-
             - masks-workdir-v3-
       - run:
@@ -485,10 +489,6 @@ jobs:
       - restore_cache:
           keys:
             - build-v1-{{ .Branch }}-{{ .Revision }}
-            - build-v1--{{ .Revision }}
-            - build-v1-{{ .Branch }}-
-            - build-v1-master-
-            - build-v1-
           paths:
             - /tmp/docker
             - /tmp/images