From 6dfc7d7844ea20e2d07eab059c03363cb26311d6 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Wed, 23 May 2018 08:57:37 -0400 Subject: [PATCH 1/2] ENH: Update CircleCI CMake version to 3.11.2 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6abacdf32a..5c273823872 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,7 +48,7 @@ jobs: sudo apt-get install -y rsync ninja-build ccache sudo pip install --upgrade pip sudo pip install scikit-ci-addons - ci_addons circle/install_cmake.py 3.9.5 + ci_addons circle/install_cmake.py 3.11.2 - run: name: CCache initialization command: | From 1030e25f0ad2b9528cebbfdcca1fa8d7d6f67b3c Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Wed, 23 May 2018 09:02:31 -0400 Subject: [PATCH 2/2] BUG: Correct detection of most recent data file Specify null terminated items for xargs. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c273823872..3d49d1ecc32 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ referenced: name: Generate external data hash command: | cd ITK - find . -name \*.md5 -o -name \*.sha512 -print0 | xargs -d "\n" git log -n 1 | tee /home/circleci/external-data.hashable + find . -name \*.md5 -o -name \*.sha512 -print0 | xargs -0 git log -n 1 | tee /home/circleci/external-data.hashable restore-data-step: &restore-data-step restore_cache: keys: