Merge pull request #3456 from GeotrekCE/optimize_ci

optimize CI
GeotrekCE · Jan 31, 2023 · 1955abe · 1955abe
2 parents 8652dd0 + 31f229a
commit 1955abe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -26,6 +26,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAT }}
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -38,16 +40,16 @@ jobs:
             ~/.cache/pip
             ~/.wheel_dir
 
-          key: ${{ matrix.os }}-pip-${{ matrix.python-version }}
+          key: pip-${{ matrix.python-version }}
           restore-keys: |
-            ${{ matrix.os }}-pip-${{ matrix.python-version }}
+            pip-${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
           pip3 wheel --wheel-dir=~/.wheel_dir pip wheel setuptools
           pip3 install --find-links=~/.wheel_dir --upgrade pip wheel setuptools
-          pip3 wheel --wheel-dir=~/.wheel_dir -r requirements-dev.txt
-          pip3 install --find-links=~/.wheel_dir --upgrade -r requirements-dev.txt
+          pip3 wheel --wheel-dir=~/.wheel_dir pip-tools -c requirements-dev.txt
+          pip3 install --find-links=~/.wheel_dir --upgrade pip-tools -c requirements-dev.txt
 
       - name: Check dependency graph
         run: |
@@ -73,6 +75,3 @@ jobs:
         if: ${{ github.actor == 'dependabot[bot]' }}
         with:
           commit_message: Apply dependencies update by dependabot
-          commit_user_name: dependabot[bot]
-          commit_user_email: [email protected]
-          commit_author: dependabot[bot] <[email protected]>
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
@@ -29,5 +29,5 @@ jobs:
       - name: Documentation
         run: |
           cd docs/
-          pip install -r ./requirements.txt
+          pip install -r ./requirements.txt -U
           make html SPHINXOPTS="-W"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -37,16 +37,14 @@ jobs:
             ~/.cache/pip
             ~/.wheel_dir
 
-          key: ${{ matrix.os }}-pip-${{ matrix.python-version }}
+          key: pip-${{ matrix.python-version }}
           restore-keys: |
-            ${{ matrix.os }}-pip-${{ matrix.python-version }}
+            pip-${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
-          pip3 wheel --wheel-dir=~/.wheel_dir pip wheel setuptools
-          pip3 install --find-links=~/.wheel_dir --upgrade pip wheel setuptools
-          pip3 wheel --wheel-dir=~/.wheel_dir -r requirements-dev.txt
-          pip3 install --find-links=~/.wheel_dir --upgrade -r requirements-dev.txt
+          pip3 wheel --wheel-dir=~/.wheel_dir flake8 -c requirements-dev.txt
+          pip3 install --find-links=~/.wheel_dir --upgrade flake8 -c requirements-dev.txt
 
       - name: Flake8
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -83,9 +83,9 @@ jobs:
           ~/.cache/pip
           ~/.wheel_dir
 
-        key: ${{ matrix.os }}-pip-${{ matrix.python-version }}
+        key: pip-${{ matrix.python-version }}
         restore-keys: |
-          ${{ matrix.os }}-pip-${{ matrix.python-version }}
+          pip-${{ matrix.python-version }}
 
     - name: Install System dependencies
       run: |