updated action version, added os matrix testing, added 3.12 to matrix

btr1975 · Mar 29, 2024 · 2134644 · 2134644
1 parent 77ca974
commit 2134644
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 15 deletions.
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -14,7 +14,7 @@
     "include_webpages": ["n", "y"],
     "container_runtime": ["podman", "docker"],
     "__template_repo": "https://github.com/btr1975/cookiecutter-python-fastapi-openapi",
-    "__template_version": "1.0.9",
+    "__template_version": "1.0.10",
     "_new_lines":"\n",
     "_copy_without_render": [
         "{{cookiecutter.__app_name}}/templates",

diff --git a/{{cookiecutter.git_repo_name}}/.github/workflows/publish-to-pypi.yml b/{{cookiecutter.git_repo_name}}/.github/workflows/publish-to-pypi.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Upgrade pip setuptools wheel
       run: |

diff --git a/{{cookiecutter.git_repo_name}}/.github/workflows/test-coverage-lint.yml b/{{cookiecutter.git_repo_name}}/.github/workflows/test-coverage-lint.yml
@@ -20,21 +20,24 @@ on:
       - bug/*
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
+  linting:
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         python-version:
           - 3.8
           - 3.9
           - '3.10'
           - '3.11'
+          - '3.12'
+        os:
+          - ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Upgrade pip setuptools wheel
@@ -46,9 +49,69 @@ jobs:
     - name: Run Linting
       run: |
         make pylint
-    - name: Run Unit-Testing and Coverage
-      run: |
-        make coverage
-    - name: Run Build
-      run: |
-        make build
+
+  testing-coverage:
+    needs: linting
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - 3.8
+          - 3.9
+          - '3.10'
+          - '3.11'
+          - '3.12'
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip setuptools wheel
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+      - name: Install requirements from requirements-dev.txt
+        run: |
+          pip install -r requirements-dev.txt
+      - name: Run Unit-Testing and Coverage
+        run: |
+          make coverage
+
+  build:
+    needs: testing-coverage
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - 3.8
+          - 3.9
+          - '3.10'
+          - '3.11'
+          - '3.12'
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Upgrade pip setuptools wheel
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+      - name: Install requirements from requirements-dev.txt
+        run: |
+          pip install -r requirements-dev.txt
+      - name: Run Build
+        run: |
+          make build