refactor: Split workflows and add Makefile

Author: alecron

.github/workflows/publish.yaml

@@ -9,9 +9,9 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to publish'
+        description: "Version to publish"
         required: false
-        default: 'latest'
+        default: "latest"
         type: string
 
 jobs:
@@ -25,36 +25,6 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
-      - name: Setup python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-          cache: 'poetry'
-      
-      - name: Install dependencies
-        run: poetry install
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v5
-        with:
-          version: "0.7.17"
-
-      - name: Download dependencies
-        run: |
-          uv sync
-
-      - name: Run ruff
-        run: |
-          uvx ruff check --fix --config ruff.toml
-
-      - name: Run Unit Tests
-        run: |
-          uv run pytest --capture=tee-sys --junitxml=pytest.xml
-
-      - name: Run Test Coverage
-        run: |
-          uv run pytest --cov=. --cov-report=xml
-
       - name: Extract version
         id: extract_version
         run: |
@@ -76,41 +46,3 @@ jobs:
           tags: |
             ghcr.io/sysdiglabs/sysdig-mcp-server:latest
             ghcr.io/sysdiglabs/sysdig-mcp-server:v${{ steps.extract_version.outputs.VERSION }}
-
-      - name: "Check test reports exists"
-        if: always()
-        id: check-test-results-exists
-        uses: andstor/file-existence-action@v3
-        with:
-          files: "pytest.xml, coverage.xml"
-
-      - name: Create pack-wise pytest report
-        run: poetry run python .github/github_workflow_scripts/parse_junit_per_pack.py
-        if: |
-          always() && 
-          steps.check-test-results-exists.outputs.files_exists == 'true' && 
-          github.event.pull_request.head.repo.fork == false
-
-      - name: Upload junit & pack-wise pytest report
-        uses: PaloAltoNetworks/[email protected]
-        if: |
-          always() && 
-          steps.check-test-results-exists.outputs.files_exists == 'true' && 
-          github.event.pull_request.head.repo.fork == false
-        with:
-          name: pytest
-          path: |
-            coverage.xml
-          if-no-files-found: error
-
-      - name: Pytest coverage comment
-        if: |
-          always() && 
-          steps.check-test-results-exists.outputs.files_exists == 'true' && 
-          steps.check-test-results-exists.outputs.files_exists == 'true' && 
-          ! github.event.pull_request.head.repo.fork
-        uses: MishaKav/[email protected]
-        continue-on-error: true  # may fail on output > 65k chars
-        with:
-          pytest-xml-coverage-path: coverage.xml
-          junitxml-path: coverage.xml

.github/workflows/test.yaml

@@ -0,0 +1,39 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read # required for actions/checkout
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+          cache: "pip"
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.7.17"
+
+      - name: Download dependencies
+        run: make init
+
+      - name: Run ruff
+        run: make lint
+
+      - name: Run Unit Tests
+        run: make test

.pre-commit-config.yaml

@@ -4,12 +4,12 @@ repos:
       - id: ruff-format
         name: Ruff Format
         description: Format code with ruff.
-        entry: bash -c 'uvx ruff format --config ruff.toml'
+        entry: make fmt
         language: system
         stages: ["commit", "push"]
       - id: ruff-check
         name: Ruff Check
         description: Check code style with ruff.
-        entry: bash -c 'uvx ruff check --config ruff.toml'
+        entry: make lint
         language: system
         stages: ["commit", "push"]

CODEOWNERS

@@ -1,5 +1,9 @@
 # These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
+
+# the repo. Unless a later match takes precedence
+
 # @S3B4SZ17 @alecron and @sysdiglabs/sysdig-training will be requested for
-# review when someone opens a pull request.
-*       @S3B4SZ17 @alecron @sysdiglabs/sysdig-training
+
+# review when someone opens a pull request
+
+*       @sysdiglabs/sysdig-training

Makefile

@@ -0,0 +1,24 @@
+.PHONY: help init lint fmt test test-coverage
+
+help:
+	@echo "Available commands:"
+	@echo "  make init    - Install dependencies"
+	@echo "  make lint    - Lint and fix code"
+	@echo "  make fmt     - Format code"
+	@echo "  make test    - Run tests"
+	@echo "  make test-coverage - Run tests and generate coverage report"
+
+init:
+	uv sync
+
+lint:
+	uvx ruff check --fix --config ruff.toml
+
+fmt:
+	uvx ruff format --config ruff.toml
+
+test:
+	uv run pytest --capture=tee-sys --junitxml=pytest.xml
+
+test-coverage:
+	uv run pytest --cov=. --cov-report=xml

main.py

@@ -33,7 +33,7 @@ def main():
     else:
         # Run MCP server over streamable HTTP by default
         run_http()
-    
+
 
 if __name__ == "__main__":
     main()