From: David Lord <davidism@gmail.com>
Date: Fri, 20 Jan 2023 21:35:30 +0000 (-0800)
Subject: Merge branch '3.1.x'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96a83e90145436dc47c902d3a9039bfbcb6699b0;p=thirdparty%2Fjinja.git

Merge branch '3.1.x'
---

96a83e90145436dc47c902d3a9039bfbcb6699b0
diff --cc .github/workflows/tests.yaml
index 85e748b6,a85f6c7b..81787304
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@@ -47,10 -47,10 +47,10 @@@ jobs
            pip install -U setuptools
            python -m pip install -U pip
        - name: cache mypy
-         uses: actions/cache@v3
+         uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12
          with:
            path: ./.mypy_cache
 -          key: mypy|${{ matrix.python }}|${{ hashFiles('setup.cfg') }}
 +          key: mypy|${{ matrix.python }}|${{ hashFiles('pyproject.toml') }}
          if: matrix.tox == 'typing'
        - run: pip install tox
        - run: tox run -e ${{ matrix.tox }}