chore(ci): incorporate tests of pact cli

Signed-off-by: JP-Ellis <[email protected]>

Author: JP-Ellis

.github/workflows/test.yml

@@ -29,8 +29,8 @@ jobs:
 
     runs-on: ubuntu-latest
     needs:
-      - test-linux
-      - test-other
+      - test-container
+      - test
       - example
       - format
       - lint
@@ -44,7 +44,7 @@ jobs:
         if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') || contains(needs.*.result,
           'skipped')
 
-  test-linux:
+  test-container:
     name: >-
       Test Python ${{ matrix.python-version }}
       on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
@@ -93,9 +93,6 @@ jobs:
         uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f  # v6.4.1
         with:
           enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
 
       - name: Install Python
         run: uv python install ${{ matrix.python-version }}
@@ -118,6 +115,10 @@ jobs:
       - name: Run tests
         run: hatch run test --broker-url=http://pactbroker:pactbroker@localhost:9292 --container
 
+      - name: Run tests (CLI)
+        working-directory: pact-python-cli
+        run: hatch run test
+
       - name: Upload coverage
         if: matrix.python-version == env.STABLE_PYTHON_VERSION && matrix.os == 'ubuntu-latest'
         uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24  # v5.4.3
@@ -131,7 +132,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-  test-other:
+  test:
     name: >-
       Test Python ${{ matrix.python-version }}
       on ${{ startsWith(matrix.os, 'macos-') && 'macOS' || startsWith(matrix.os, 'windows-') && 'Windows' || 'Linux' }}
@@ -142,8 +143,9 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - windows-latest
           - macos-latest
+          - ubuntu-latest
+          - windows-latest
         python-version:
           - '3.9'
           - '3.10'
@@ -167,9 +169,6 @@ jobs:
         uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f  # v6.4.1
         with:
           enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
 
       - name: Install Python
         run: uv python install ${{ matrix.python-version }}
@@ -180,6 +179,10 @@ jobs:
       - name: Run tests
         run: hatch run test
 
+      - name: Run tests (CLI)
+        working-directory: pact-python-cli
+        run: hatch run test
+
   example:
     name: Example
 
@@ -205,9 +208,6 @@ jobs:
         uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f  # v6.4.1
         with:
           enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
 
       - name: Install Python
         run: uv python install ${{ env.STABLE_PYTHON_VERSION }}
@@ -255,9 +255,6 @@ jobs:
         uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f  # v6.4.1
         with:
           enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
 
       - name: Install Python
         run: uv python install ${{ env.STABLE_PYTHON_VERSION }}
@@ -268,6 +265,10 @@ jobs:
       - name: Format
         run: hatch run format
 
+      - name: Format (CLI)
+        working-directory: pact-python-cli
+        run: hatch run format
+
   lint:
     name: Lint
 
@@ -280,9 +281,6 @@ jobs:
         uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f  # v6.4.1
         with:
           enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
 
       - name: Install Python
         run: uv python install ${{ env.STABLE_PYTHON_VERSION }}
@@ -293,6 +291,10 @@ jobs:
       - name: Format
         run: hatch run lint
 
+      - name: Format (CLI)
+        working-directory: pact-python-cli
+        run: hatch run lint
+
   typecheck:
     name: Typecheck
 
@@ -305,17 +307,18 @@ jobs:
         uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f  # v6.4.1
         with:
           enable-cache: true
-          cache-dependency-glob: |
-            **/pyproject.toml
-            **/uv.lock
 
       - name: Install Python
         run: uv python install ${{ env.STABLE_PYTHON_VERSION }}
 
       - name: Install Hatch
         run: uv tool install hatch
 
-      - name: Format
+      - name: Typecheck
+        run: hatch run typecheck
+
+      - name: Typecheck (CLI)
+        working-directory: pact-python-cli
         run: hatch run typecheck
 
   spelling: