From 38c8afc6f7a74f961e9627998de56507e8e4d2eb Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Tue, 10 Jul 2018 08:56:28 -0400 Subject: [PATCH] Use the job name instead of the arch arch is only the hardware architecture. this is not sufficient to differentiate between platforms with ABI incompatibilities. job name should be good enough (maybe more fine-grained than we really want but easy to express and maintain). --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f2620214c..3943fb0da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -85,8 +85,8 @@ jobs: - restore_cache: &RESTORE_WHEELHOUSE keys: - - v2-wheelhouse-{{ arch }}-{{ checksum "setup.py" }}-{{ checksum "src/allmydata/_auto_deps.py" }} - - v2-wheelhouse-{{ arch }} + - v2-wheelhouse-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "src/allmydata/_auto_deps.py" }} + - v2-wheelhouse-{{ .Environment.CIRCLE_JOB }} - v2-wheelhouse- - run: &BOOTSTRAP_TEST_ENVIRONMENT @@ -111,7 +111,7 @@ jobs: - "/tmp/nobody/.cache/pip" - save_cache: &SAVE_WHEELHOUSE - key: v2-wheelhouse-{{ arch }}-{{ checksum "/tmp/project/setup.py" }}-{{ checksum "/tmp/project/src/allmydata/_auto_deps.py" }} + key: v2-wheelhouse-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/project/setup.py" }}-{{ checksum "/tmp/project/src/allmydata/_auto_deps.py" }} paths: - *WHEELHOUSE_PATH