Merge branch 'dev'

Author: janiversen

.github/workflows/ci.yml

@@ -17,74 +17,72 @@ on:
 
 
 jobs:
+  linters:
+    name: Linters
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Set up python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.8
+
+      - name: venv restore
+        id: cache-venv
+        uses: syphar/restore-virtualenv@v1
+        with:
+          requirement_files: requirements.txt
+
+      - name: venv create
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        run: pip install -e . -r requirements.txt
+
+      - name: codespell
+        run: codespell
+
+      - name: pylint
+        run: pylint --recursive=y examples pymodbus test
+
+      - name: precommit (black, bandit, and ruff)
+        run: pre-commit run --all-files
+
+      - name: docs
+        run: make -C doc/ html
+
+      - name: mypy
+        run: mypy pymodbus
+
+
   integreation_test:
-    name: ${{ matrix.task.name }} - ${{ matrix.os.on }} - ${{ matrix.python.version }}
+    name: pytest - ${{ matrix.os.on }} - ${{ matrix.python.version }}
     runs-on: ${{ matrix.os.on }}
+    needs: linters
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
-        task:
-          - name: pylint
-            cmd: pylint --recursive=y examples pymodbus test
-            type: lint
-          - name: codespell
-            cmd: codespell
-            type: lint
-          - name: bandit
-            cmd: bandit -r -c bandit.yaml .
-            type: lint
-          - name: flake8
-            cmd: flake8
-            type: lint
-          - name: precommit (isort and black)
-            cmd: pre-commit run --all-files
-            type: lint
-          - name: docs
-            cmd: make -C doc/ html
-            type: lint
-          - name: mypy
-            cmd: mypy pymodbus
-            type: lint
-          - name: pytest
-            cmd: pytest --cov=pymodbus --cov=test --cov-report=term-missing --cov-report=xml -v --full-trace --timeout=20
-            type: test
         os:
-          - name: Linux
-            on: ubuntu-latest
-            lint: 'yes'
-          - name: Macos
-            on: macos-latest
-            lint: 'no'
-          - name: Windows
-            on: windows-latest
-            lint: 'no'
+          - on: ubuntu-latest
+          - on: macos-latest
+          - on: windows-latest
         python:
           - version: '3.8'
-            lint: 'yes'
           - version: '3.9'
-            lint: 'no'
           - version: '3.10'
-            lint: 'no'
           - version: '3.11'
-            lint: 'no'
           - version: pypy-3.8
-            lint: 'no'
         exclude:
-          - task:
-              type: lint
-            os:
-              lint: 'no'
-          - task:
-              type: lint
-            python:
-              lint: 'no'
           - os:
-              name: Macos
+              on: macos-latest
             python:
               version: pypy-3.8
           - os:
-              name: Windows
+              on: windows-latest
             python:
               version: pypy-3.8
     steps:
@@ -106,5 +104,15 @@ jobs:
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: pip install -e . -r requirements.txt
 
-      - name: test/lint
-        run: ${{ matrix.task.cmd }}
+      - name: pytest
+        run: pytest --cov=pymodbus --cov=test --cov-report=term-missing --cov-report=xml -v --full-trace --timeout=20
+
+  ci_complete:
+    name: ci_complete
+    runs-on: ubuntu-latest
+    needs:
+      - integreation_test
+    timeout-minutes: 1
+    steps:
+      - name: Dummy
+        run: ls