From a93ae2ce29063abdc5e351e0811b6999349cf9de Mon Sep 17 00:00:00 2001 From: Jon Zeolla Date: Thu, 3 Aug 2023 16:05:24 -0400 Subject: [PATCH] ci: Tightly couple caches to the lockfile hash --- .github/workflows/ci.yml | 3 --- .github/workflows/security.yml | 3 --- .github/workflows/update.yml | 3 --- .../.github/workflows/commit.yml" | 9 --------- .../.github/workflows/release.yml" | 3 --- .../.github/workflows/security.yml" | 3 --- .../.github/workflows/update.yml" | 3 --- 7 files changed, 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 409b7b5c..73320eda 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,9 +58,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }} - restore-keys: | - ${{ runner.os }}-python-${{ env.python_version }}-pipenv- - ${{ runner.os }}-python- - name: Install the dependencies run: python -m pip install --upgrade pipenv - name: Install Task diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index d8dc61b2..561c2685 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -26,9 +26,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }} - restore-keys: | - ${{ runner.os }}-python-${{ env.python_version }}-pipenv- - ${{ runner.os }}-python- - name: Install the dependencies run: | python -m pip install --upgrade pipenv diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 0f711ae1..e4824118 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -30,9 +30,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-${{ env.python_version }}-pipenv-${{ hashFiles('Pipfile.lock') }} - restore-keys: | - ${{ runner.os }}-python-${{ env.python_version }}-pipenv- - ${{ runner.os }}-python- - name: Install the dependencies run: python -m pip install --upgrade pipenv - name: Install Task diff --git "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/commit.yml" "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/commit.yml" index d87287b6..3542408e 100644 --- "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/commit.yml" +++ "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/commit.yml" @@ -47,9 +47,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv-${{ "{{ hashFiles('Pipfile.lock') }}" }} - restore-keys: | - ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv- - ${{ "{{ runner.os }}" }}-python- - name: Install the dependencies run: | python -m pip install --upgrade pipenv @@ -119,9 +116,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv-${{ "{{ hashFiles('Pipfile.lock') }}" }} - restore-keys: | - ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv- - ${{ "{{ runner.os }}" }}-python- - name: Install the dependencies run: python -m pip install --upgrade pipenv - name: Install Task @@ -173,9 +167,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv-${{ "{{ hashFiles('Pipfile.lock') }}" }} - restore-keys: | - ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv- - ${{ "{{ runner.os }}" }}-python- - name: Install the dependencies run: python -m pip install --upgrade pipenv - name: Install Task diff --git "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/release.yml" "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/release.yml" index 68a275a4..08fe95e6 100644 --- "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/release.yml" +++ "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/release.yml" @@ -39,9 +39,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv-${{ "{{ hashFiles('Pipfile.lock') }}" }} - restore-keys: | - ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv- - ${{ "{{ runner.os }}" }}-python- - name: Install the dependencies run: python -m pip install --upgrade pipenv - name: Install Task diff --git "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/security.yml" "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/security.yml" index 3f9c5e24..87d6096f 100644 --- "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/security.yml" +++ "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/security.yml" @@ -36,9 +36,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv-${{ "{{ hashFiles('Pipfile.lock') }}" }} - restore-keys: | - ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv- - ${{ "{{ runner.os }}" }}-python- - name: Install the dependencies run: | python -m pip install --upgrade pipenv diff --git "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/update.yml" "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/update.yml" index ba473bdf..f0c93d43 100644 --- "a/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/update.yml" +++ "b/{{cookiecutter.project_name|replace(\" \", \"\")}}/.github/workflows/update.yml" @@ -30,9 +30,6 @@ jobs: with: path: ~/.local/share/virtualenvs key: ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv-${{ "{{ hashFiles('Pipfile.lock') }}" }} - restore-keys: | - ${{ "{{ runner.os }}" }}-python-${{ "{{ env.python_version }}" }}-pipenv- - ${{ "{{ runner.os }}" }}-python- - name: Install the dependencies run: python -m pip install --upgrade pipenv - name: Install Task