diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml index afbaa659d..4b2e0f324 100644 --- a/.github/workflows/cache.yml +++ b/.github/workflows/cache.yml @@ -15,14 +15,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- - - name: Cache Vagrant boxes uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 with: @@ -31,25 +23,3 @@ jobs: key: vagrant-boxes-${{ hashFiles('**/molecule.yml') }} restore-keys: | vagrant-boxes - - - name: Download Vagrant boxes for all scenarios - # To save some cache space, all scenarios share the same cache key. - # On the other hand, this means that the cache contents should be - # the same across all scenarios. This step ensures that. - run: ./.github/download-boxes.sh - - - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@75f3110429a8c05be0e1bf360334e4cced2b63fa # 2.3.3 - with: - python-version: ${{ env.PYTHON_VERSION }} - cache: 'pip' # caching pip dependencies - - - name: Install dependencies - run: | - echo "::group::Upgrade pip" - python3 -m pip install --upgrade pip - echo "::endgroup::" - - echo "::group::Install Python requirements from requirements.txt" - python3 -m pip install -r requirements.txt - echo "::endgroup::" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc8fa6482..8ba70a35f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,13 +30,13 @@ jobs: * fdad:bad:ba55::/64 EOF - - name: Cache pip - uses: actions/cache@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + - name: Restore pip + uses: actions/cache/restore@9b0c1fce7a93df8e3bb8926b0d6e9d89e92f20a7 # 3.0.11 + id: cache with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-${{ hashFiles('./requirements.txt') }} - restore-keys: | - ${{ runner.os }}-pip- + key: ${{ runner.os }}-pip- + fail-on-cache-miss: true - name: Download Vagrant boxes for all scenarios # To save some cache space, all scenarios share the same cache key.