@@ -357,16 +357,16 @@ jobs:
357
357
path : ~/.cache/pip
358
358
key : ${{ runner.os }}-pip-requirements-dev-${{ hashFiles('ansible_collections/arista/avd/requirements-dev.txt') }}-${{ matrix.python_version }}
359
359
360
- # Restore cache for ansible-core<2.19.0
360
+ # Restore cache for ansible-core
361
361
- name : Restore cache for ansible-core
362
362
uses : actions/cache@v3
363
363
with :
364
- path : ~/.cache/pip
365
- key : ${{ runner.os }}-pip-requirements-dev-${{ hashFiles(" ansible-core<2.19.0") }} -${{ matrix.python_version }}
364
+ path : ~/.cache/ansible
365
+ key : ${{ runner.os }}-pip-ansible-core-${{ matrix.python_version }}
366
366
367
367
- name : Install ansible requirements
368
368
run : |
369
- pip install -r "ansible-core<2.19.0" --upgrade
369
+ pip install "ansible-core<2.19.0" --upgrade
370
370
371
371
# Install Python requirements (both requirements files)
372
372
- name : Install Python requirements
@@ -417,13 +417,13 @@ jobs:
417
417
- name : Restore cache for ansible-core<2.19.0
418
418
uses : actions/cache@v3
419
419
with :
420
- path : ~/.cache/pip
421
- key : ${{ runner.os }}-pip-requirements-ci-${{ hashFiles(' ansible-core<2.19.0') }} -${{ matrix.python_version }}
420
+ path : ~/.cache/ansible
421
+ key : ${{ runner.os }}-pip-ansible-core-${{ matrix.python_version }}
422
422
restore-keys : |
423
- ${{ runner.os }}-pip-requirements-ci-${{ hashFiles(' ansible-core<2.19.0') }} -3.10
424
- ${{ runner.os }}-pip-requirements-ci-${{ hashFiles(' ansible-core<2.19.0') }} -3.11
425
- ${{ runner.os }}-pip-requirements-ci-${{ hashFiles(' ansible-core<2.19.0') }} -3.12
426
- ${{ runner.os }}-pip-requirements-ci-${{ hashFiles(' ansible-core<2.19.0') }} -3.13
423
+ ${{ runner.os }}-pip-ansible-core-3.10
424
+ ${{ runner.os }}-pip-ansible-core-3.11
425
+ ${{ runner.os }}-pip-ansible-core-3.12
426
+ ${{ runner.os }}-pip-ansible-core-3.13
427
427
428
428
- name : ' Run ansible-test sanity'
429
429
run : |
@@ -452,10 +452,11 @@ jobs:
452
452
- name : Restore cache for ansible-core<2.19.0
453
453
uses : actions/cache@v3
454
454
with :
455
- path : ~/.cache/pip
456
- key : ${{ runner.os }}-pip-requirements-ci-${{ hashFiles(' ansible-core<2.19.0') }} -3.10
455
+ path : ~/.cache/ansible
456
+ key : ${{ runner.os }}-pip-ansible-core-3.10
457
457
restore-keys : |
458
- ${{ runner.os }}-pip-requirements-ci-${{ hashFiles('ansible-core<2.19.0') }}-3.10
458
+ ${{ runner.os }}-pip-ansible-core-3.10
459
+
459
460
- name : ' Install Python requirements'
460
461
run : |
461
462
pip install mock pytest pytest-mock pytest-xdist pyyaml --upgrade
0 commit comments