mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-03-21 03:15:16 +00:00
Manage the cache around *only* virtualenv setup
We don't need anything from the cache in the bootstrap step and Slackware cannot interact with the cache until after the bootstrap step anyway.
This commit is contained in:
parent
b99120048f
commit
0d209c0af4
@ -78,6 +78,11 @@ jobs:
|
||||
|
||||
- "checkout"
|
||||
|
||||
- run: &BOOTSTRAP_TEST_ENVIRONMENT
|
||||
name: "Bootstrap test environment"
|
||||
command: |
|
||||
~/project/.circleci/bootstrap-test-environment.sh ~/project "${EXTRA_PACKAGES}"
|
||||
|
||||
- restore_cache: &RESTORE_HTTP_CACHE
|
||||
keys:
|
||||
# An exact match on the http cache key is great. It should have
|
||||
@ -106,11 +111,6 @@ jobs:
|
||||
# than being ignored).
|
||||
- v3-wheelhouse-{{ .Environment.CIRCLE_JOB }}
|
||||
|
||||
- run: &BOOTSTRAP_TEST_ENVIRONMENT
|
||||
name: "Bootstrap test environment"
|
||||
command: |
|
||||
~/project/.circleci/bootstrap-test-environment.sh ~/project "${EXTRA_PACKAGES}"
|
||||
|
||||
- run: &SETUP_VIRTUALENV
|
||||
name: "Setup virtualenv"
|
||||
# pip cannot install packages if the working directory is not
|
||||
@ -234,9 +234,6 @@ jobs:
|
||||
|
||||
- "checkout"
|
||||
|
||||
- restore_cache: *RESTORE_HTTP_CACHE
|
||||
- restore_cache: *RESTORE_WHEELHOUSE
|
||||
|
||||
- run:
|
||||
name: "Bootstrap test environment"
|
||||
working_directory: "/tmp"
|
||||
@ -267,6 +264,9 @@ jobs:
|
||||
yum install --assumeyes \
|
||||
net-tools
|
||||
|
||||
- restore_cache: *RESTORE_HTTP_CACHE
|
||||
- restore_cache: *RESTORE_WHEELHOUSE
|
||||
|
||||
- run: *SETUP_VIRTUALENV
|
||||
|
||||
- save_cache: *SAVE_HTTP_CACHE
|
||||
@ -307,9 +307,6 @@ jobs:
|
||||
|
||||
- "checkout"
|
||||
|
||||
- restore_cache: *RESTORE_HTTP_CACHE
|
||||
- restore_cache: *RESTORE_WHEELHOUSE
|
||||
|
||||
- run:
|
||||
name: "Bootstrap test environment"
|
||||
working_directory: "/tmp"
|
||||
@ -356,6 +353,9 @@ jobs:
|
||||
python get-pip.py
|
||||
pip install virtualenv
|
||||
|
||||
- restore_cache: *RESTORE_HTTP_CACHE
|
||||
- restore_cache: *RESTORE_WHEELHOUSE
|
||||
|
||||
- run: *SETUP_VIRTUALENV
|
||||
|
||||
- save_cache: *SAVE_HTTP_CACHE
|
||||
|
Loading…
x
Reference in New Issue
Block a user