From 95842791a1ac8171073323f23e570809743aa4c3 Mon Sep 17 00:00:00 2001 From: nemo Date: Mon, 26 Oct 2020 12:51:44 -0400 Subject: [PATCH 1/2] fix: install hwloc to fix metrics capture on CI --- .circleci/config.yml | 4 ---- fil-proofs-tooling/scripts/run-remote.sh | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 260aa9143..e435116b2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -435,7 +435,3 @@ workflows: - metrics_capture: requires: - cargo_fetch - filters: - branches: - only: - - master diff --git a/fil-proofs-tooling/scripts/run-remote.sh b/fil-proofs-tooling/scripts/run-remote.sh index d40c93e62..04ffc9391 100755 --- a/fil-proofs-tooling/scripts/run-remote.sh +++ b/fil-proofs-tooling/scripts/run-remote.sh @@ -16,6 +16,9 @@ _metrics_dir=/tmp/metrics/\$_one_day_from_now find /tmp/metrics/ -maxdepth 1 -mindepth 1 -type d -printf "%f\n" \ | xargs -I {} bash -c 'if (({} < \$(date +%s))) ; then rm -rf /tmp/metrics/{} ; fi' 2> /dev/null +# Make sure hwloc library is available on the remote host. +apt-get -y -q install libhwloc-dev > /dev/null 2>&1 + # Make sure rust is installed on the remote host. curl https://sh.rustup.rs -sSf | sh -s -- -y > /dev/null 2>&1 source $HOME/.cargo/env /dev/null 2>&1 From 2bfa661490de7889569d87409babbd44c8285b82 Mon Sep 17 00:00:00 2001 From: nemo Date: Mon, 26 Oct 2020 13:20:10 -0400 Subject: [PATCH 2/2] fix: add back metrics capture filter for master branch only --- .circleci/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e435116b2..260aa9143 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -435,3 +435,7 @@ workflows: - metrics_capture: requires: - cargo_fetch + filters: + branches: + only: + - master