Skip to content

Commit 5f6cced

Browse files
oestebanoesteban
authored
Merge pull request #177 from oesteban/maint/circleci-revision
MAINT: Update several CircleCI settings
2 parents 85e61c6 + 1585e0c commit 5f6cced

File tree

1 file changed

+70
-44
lines changed

1 file changed

+70
-44
lines changed

‎.circleci/config.yml

Lines changed: 70 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ docs_deploy: &docs
2121
name: Deploy docs to gh-pages branch
2222
command: gh-pages --dotfiles --message "doc(update) [skip ci]" --dist docs/_build/html
2323

24-
version: 2
25-
jobs:
24+
version: 2.1
25+
orbs:
26+
docker: circleci/[email protected]
2627

28+
jobs:
2729
build:
2830
machine:
29-
image: circleci/classic:201711-01
31+
# https://discuss.circleci.com/t/linux-machine-executor-images-2021-april-q2-update/39928
32+
# upgrade Docker version
33+
image: ubuntu-2004:202104-01
3034
working_directory: /tmp/src/dmriprep
3135
environment:
3236
TZ: "/usr/share/zoneinfo/America/Los_Angeles"
@@ -42,12 +46,20 @@ jobs:
4246
fi
4347
- restore_cache:
4448
keys:
45-
- build-v1-{{ .Branch }}-{{ epoch }}
49+
- build-v1-{{ .Branch }}-{{ .Revision }}
50+
- build-v1--{{ .Revision }}
4651
- build-v1-{{ .Branch }}-
4752
- build-v1-master-
4853
- build-v1-
4954
paths:
5055
- /tmp/docker
56+
- docker/install-docker-credential-helper
57+
- run:
58+
name: Login into Docker Hub
59+
command: |
60+
if [[ -n "$DOCKER_PAT" ]]; then
61+
echo "$DOCKER_PAT" | docker login -u $DOCKER_USER --password-stdin
62+
fi
5163
- run:
5264
name: Set-up a Docker registry
5365
command: |
@@ -110,7 +122,7 @@ jobs:
110122
docker exec -it registry /bin/registry garbage-collect --delete-untagged \
111123
/etc/docker/registry/config.yml
112124
- save_cache:
113-
key: build-v1-{{ .Branch }}-{{ epoch }}
125+
key: build-v1-{{ .Branch }}-{{ .Revision }}
114126
paths:
115127
- /tmp/docker
116128
- persist_to_workspace:
@@ -154,7 +166,8 @@ jobs:
154166

155167
- restore_cache:
156168
keys:
157-
- data-ds001771-v3-{{ .Branch }}-{{ .Revision }}-
169+
- data-ds001771-v3-{{ .Branch }}-{{ .Revision }}
170+
- data-ds001771-v3--{{ .Revision }}
158171
- data-ds001771-v3-{{ .Branch }}-
159172
- data-ds001771-v3-master-
160173
- data-ds001771-v3-
@@ -174,13 +187,14 @@ jobs:
174187
ds001771/derivatives/freesurfer-6.0.1/sub-36/surf/rh.thickness
175188
176189
- save_cache:
177-
key: data-ds001771-v3-{{ .Branch }}-{{ .Revision }}-{{ epoch }}
190+
key: data-ds001771-v3-{{ .Branch }}-{{ .Revision }}
178191
paths:
179192
- /tmp/data/ds001771
180193

181194
- restore_cache:
182195
keys:
183-
- data-ds000206-v2-{{ .Branch }}-{{ .Revision }}-
196+
- data-ds000206-v2-{{ .Branch }}-{{ .Revision }}
197+
- data-ds000206-v2--{{ .Revision }}-
184198
- data-ds000206-v2-{{ .Branch }}-
185199
- data-ds000206-v2-master-
186200
- data-ds000206-v2-
@@ -193,7 +207,7 @@ jobs:
193207
datalad get -J 2 -r -d ds000206/derivatives/ ds000206/derivatives/freesurfer-6.0.1/sub-05/*
194208
195209
- save_cache:
196-
key: data-ds000206-v2-{{ .Branch }}-{{ .Revision }}-{{ epoch }}
210+
key: data-ds000206-v2-{{ .Branch }}-{{ .Revision }}
197211
paths:
198212
- /tmp/data/ds000206
199213

@@ -219,7 +233,9 @@ jobs:
219233

220234
ds000206:
221235
machine:
222-
image: circleci/classic:201711-01
236+
# https://discuss.circleci.com/t/linux-machine-executor-images-2021-april-q2-update/39928
237+
# upgrade Docker version
238+
image: ubuntu-2004:202104-01
223239
working_directory: /tmp/ds000206
224240
environment:
225241
- FS_LICENSE: /tmp/fslicense/license.txt
@@ -242,16 +258,15 @@ jobs:
242258
at: /tmp
243259
- restore_cache:
244260
keys:
245-
- data-ds000206-v2-{{ .Branch }}-{{ .Revision }}-{{ epoch }}
261+
- data-ds000206-v2-{{ .Branch }}-{{ .Revision }}
246262
- data-ds000206-v2-{{ .Branch }}-{{ .Revision }}-
263+
- data-ds000206-v2--{{ .Revision }}-
247264
- data-ds000206-v2-{{ .Branch }}-
248265
- data-ds000206-v2-master-
249266
- data-ds000206-v2-
250267
- restore_cache:
251268
keys:
252-
- build-v1-{{ .Branch }}-{{ epoch }}
253-
- build-v1-{{ .Branch }}-
254-
- build-v1-
269+
- build-v1-{{ .Branch }}-{{ .Revision }}
255270
paths:
256271
- /tmp/docker
257272
- run:
@@ -293,7 +308,7 @@ jobs:
293308
rm -rf /tmp/ds000206/work/reportlets
294309
when: on_success
295310
- save_cache:
296-
key: ds000206-anat-v01-{{ .Branch }}-{{ .Revision }}-{{ epoch }}
311+
key: ds000206-anat-v01-{{ .Branch }}-{{ .Revision }}
297312
paths:
298313
- /tmp/ds000206/work
299314
- run:
@@ -337,7 +352,9 @@ jobs:
337352

338353
ds001771:
339354
machine:
340-
image: circleci/classic:201711-01
355+
# https://discuss.circleci.com/t/linux-machine-executor-images-2021-april-q2-update/39928
356+
# upgrade Docker version
357+
image: ubuntu-2004:202104-01
341358
working_directory: /tmp/ds001771
342359
environment:
343360
- FS_LICENSE: /tmp/fslicense/license.txt
@@ -360,15 +377,15 @@ jobs:
360377
at: /tmp
361378
- restore_cache:
362379
keys:
363-
- data-ds001771-v3-{{ .Branch }}-{{ .Revision }}-{{ epoch }}
364380
- data-ds001771-v3-{{ .Branch }}-{{ .Revision }}-
381+
- data-ds001771-v3--{{ .Revision }}-
365382
- data-ds001771-v3-{{ .Branch }}-
366383
- data-ds001771-v3-master-
367384
- data-ds001771-v3-
368385
- restore_cache:
369386
keys:
370-
- build-v1-{{ .Branch }}-{{ epoch }}
371-
- build-v1-{{ .Branch }}-
387+
- build-v1-{{ .Branch }}-{{ .Revision }}
388+
- build-v1--{{ .Revision }}
372389
- build-v1-
373390
paths:
374391
- /tmp/docker
@@ -425,7 +442,9 @@ jobs:
425442

426443
deploy_docker_patches:
427444
machine:
428-
image: circleci/classic:201711-01
445+
# https://discuss.circleci.com/t/linux-machine-executor-images-2021-april-q2-update/39928
446+
# upgrade Docker version
447+
image: ubuntu-2004:202104-01
429448
working_directory: /tmp/src/dmriprep
430449
steps:
431450
- run:
@@ -447,11 +466,16 @@ jobs:
447466
fi
448467
- restore_cache:
449468
keys:
450-
- build-v1-{{ .Branch }}-{{ epoch }}
451-
- build-v1-{{ .Branch }}-
452-
- build-v1-
469+
- build-v1-{{ .Branch }}-{{ .Revision }}
453470
paths:
454471
- /tmp/docker
472+
- docker/install-docker-credential-helper
473+
- run:
474+
name: Login into Docker Hub
475+
command: |
476+
if [[ -n "$DOCKER_PAT" ]]; then
477+
echo "$DOCKER_PAT" | docker login -u $DOCKER_USER --password-stdin
478+
fi
455479
- run:
456480
name: Set-up a Docker registry
457481
command: |
@@ -466,15 +490,14 @@ jobs:
466490
name: Deploy to Docker Hub
467491
no_output_timeout: 40m
468492
command: |
469-
if [[ -n "$DOCKER_PASS" ]]; then
470-
docker login -u $DOCKER_USER -p $DOCKER_PASS
471-
docker tag nipreps/dmriprep nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
472-
docker push nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
473-
fi
493+
docker tag nipreps/dmriprep nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
494+
docker push nipreps/dmriprep:${CIRCLE_BRANCH#docker/}
474495
475496
deploy_docker:
476497
machine:
477-
image: circleci/classic:201711-01
498+
# https://discuss.circleci.com/t/linux-machine-executor-images-2021-april-q2-update/39928
499+
# upgrade Docker version
500+
image: ubuntu-2004:202104-01
478501
working_directory: /tmp/src/dmriprep
479502
steps:
480503
- run:
@@ -496,11 +519,16 @@ jobs:
496519
fi
497520
- restore_cache:
498521
keys:
499-
- build-v1-{{ .Branch }}-{{ epoch }}
500-
- build-v1-{{ .Branch }}-
501-
- build-v1-
522+
- build-v1-{{ .Branch }}-{{ .Revision }}
502523
paths:
503524
- /tmp/docker
525+
- docker/install-docker-credential-helper
526+
- run:
527+
name: Login into Docker Hub
528+
command: |
529+
if [[ -n "$DOCKER_PAT" ]]; then
530+
echo "$DOCKER_PAT" | docker login -u $DOCKER_USER --password-stdin
531+
fi
504532
- run:
505533
name: Set-up a Docker registry
506534
command: |
@@ -515,15 +543,12 @@ jobs:
515543
name: Deploy to Docker Hub
516544
no_output_timeout: 40m
517545
command: |
518-
if [[ -n "$DOCKER_PASS" ]]; then
519-
docker login -u $DOCKER_USER -p $DOCKER_PASS
520-
docker tag nipreps/dmriprep nipreps/dmriprep:unstable
521-
docker push nipreps/dmriprep:unstable
522-
if [[ -n "$CIRCLE_TAG" ]]; then
523-
docker push nipreps/dmriprep:latest
524-
docker tag nipreps/dmriprep nipreps/dmriprep:$CIRCLE_TAG
525-
docker push nipreps/dmriprep:$CIRCLE_TAG
526-
fi
546+
docker tag nipreps/dmriprep nipreps/dmriprep:unstable
547+
docker push nipreps/dmriprep:unstable
548+
if [[ -n "$CIRCLE_TAG" ]]; then
549+
docker push nipreps/dmriprep:latest
550+
docker tag nipreps/dmriprep nipreps/dmriprep:$CIRCLE_TAG
551+
docker push nipreps/dmriprep:$CIRCLE_TAG
527552
fi
528553
529554
test_deploy_pypi:
@@ -638,6 +663,7 @@ jobs:
638663
- restore_cache:
639664
keys:
640665
- docs-v1-{{ .Branch }}-{{ .Revision }}
666+
- docs-v1--{{ .Revision }}
641667
- docs-v1-{{ .Branch }}-
642668
- docs-v1-master
643669
- docs-v1-
@@ -735,9 +761,9 @@ workflows:
735761
- test_deploy_pypi:
736762
filters:
737763
branches:
738-
ignore:
739-
- /docs\/.*/
740-
- /docker\/.*/
764+
only:
765+
- /rel\/.*/
766+
- /maint\/.*/
741767
tags:
742768
only: /.*/
743769

0 commit comments

Comments
 (0)