Merge branch 'development'

tchar · Aug 9, 2021 · cdc539c · cdc539c
2 parents b6a2d12 + 518e2e3
commit cdc539c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/benchmark-linux.yml b/.github/workflows/benchmark-linux.yml
@@ -52,16 +52,16 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
+          key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
+            ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
       # - name: Restore tox requirements
       #   uses: actions/cache@v2
       #   with:
       #     path: .tox
-      #     key: ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ hashFiles('requirements/*requirements.txt') }}
+      #     key: ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ hashFiles('requirements/*requirements.txt') }}
       #     restore-keys: |
-      #       ${{ runner.os }}-${{ matrix.python-version }}-tox-
+      #       ${{ matrix.os }}-${{ matrix.python-version }}-tox-
       # Setup python
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
@@ -81,9 +81,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ./cache
-          key: ${{ runner.os }}-${{ matrix.python-version }}-benchmark
+          key: ${{ matrix.os }}-${{ matrix.python-version }}-benchmark
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-benchmark
+            ${{ matrix.os }}-${{ matrix.python-version }}-benchmark
         # Store benchmark results only when branch is master
       - name: Store benchmark result
         uses: rhysd/github-action-benchmark@v1

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
@@ -56,16 +56,16 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
+          key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
+            ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
       # - name: Restore tox requirements
       #   uses: actions/cache@v2
       #   with:
       #     path: .tox
-      #     key: ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-${{ hashFiles('requirements/*requirements.txt') }}
+      #     key: ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-${{ hashFiles('requirements/*requirements.txt') }}
       #     restore-keys: |
-      #       ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-
+      #       ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -88,7 +88,7 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2
         with:
-          name: os:${{ runner.os }}-python:${{ matrix.python-version }}
+          name: os:${{ matrix.os }}-python:${{ matrix.python-version }}
           directory: ./cover/xml
           files: coverage.xml
           env_vars: OS,PYTHON

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -56,16 +56,16 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
+          key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
+            ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
       # - name: Restore tox requirements
       #   uses: actions/cache@v2
       #   with:
       #     path: .tox
-      #     key: ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-${{ hashFiles('requirements/*requirements.txt') }}
+      #     key: ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-${{ hashFiles('requirements/*requirements.txt') }}
       #     restore-keys: |
-      #       ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-
+      #       ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -88,7 +88,7 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2
         with:
-          name: os:${{ runner.os }}-python:${{ matrix.python-version }}
+          name: os:${{ matrix.os }}-python:${{ matrix.python-version }}
           directory: ./cover/xml
           files: coverage.xml
           env_vars: OS,PYTHON

diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
@@ -56,16 +56,16 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ matrix.path }}
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
+          key: ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-${{ hashFiles('requirements/dev-requirements.txt') }}
           restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
+            ${{ matrix.os }}-${{ matrix.python-version }}-pip-${{ env.VERSION }}-
       # - name: Restore tox requirements
       #   uses: actions/cache@v2
       #   with:
       #     path: .tox
-      #     key: ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-${{ hashFiles('requirements/*requirements.txt') }}
+      #     key: ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-${{ hashFiles('requirements/*requirements.txt') }}
       #     restore-keys: |
-      #       ${{ runner.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-
+      #       ${{ matrix.os }}-${{ matrix.python-version }}-tox-${{ env.VERSION }}-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
@@ -88,7 +88,7 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v2
         with:
-          name: os:${{ runner.os }}-python:${{ matrix.python-version }}
+          name: os:${{ matrix.os }}-python:${{ matrix.python-version }}
           directory: ./cover/xml
           files: coverage.xml
           env_vars: OS,PYTHON