Standardise PR workflow on ci.yml and drop scheduled SBOM scan

.gitea/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Lint & Security
+name: CI
 
 on:
   pull_request:
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  precommit-and-security:
+  lint-and-security:
     name: lint-and-security
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -70,8 +70,9 @@ jobs:
             | "\($d.name)@\($d.version) -> \(.id) [fix: \(if (.fix_versions | length) > 0 then (.fix_versions | join(", ")) else "none" end)]"
           ' pip-audit.json
 
-          # Fail only on fixable findings (mirrors the Grype policy in security-scan.yml).
-          # The type guard ensures a crashed/empty report fails rather than silently passing.
+          # Fail only on fixable findings. The type guard ensures a crashed or empty
+          # report fails rather than silently passing. Dependency security updates
+          # are handled by the central Renovate job.
           jq -e '
             (.dependencies | type) == "array"
             and
@@ -82,6 +83,10 @@ jobs:
     name: tests
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.11", "3.13"]
 
     steps:
       - name: Checkout code
@@ -92,7 +97,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Poetry
         run: pip install "poetry>=2,<3"

.gitea/workflows/security-scan.yml

@@ -1,91 +0,0 @@
-name: Security Scan
-
-on:
-  schedule:
-    - cron: 27 8 * * *
-  workflow_dispatch:
-
-jobs:
-  security-scan:
-    runs-on: running-man
-
-    env:
-      TARGET_DIR: .
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      # Tool versions are centralised in the shared actions; bump them there and
-      # re-tag rather than editing every repository.
-      - name: Install Grype
-        uses: https://git.sysmd.uk/mdaleo404/actions/install-grype@v1
-
-      - name: Install Syft
-        uses: https://git.sysmd.uk/mdaleo404/actions/install-syft@v1
-
-      - name: Generate SBOM
-        working-directory: ${{ env.TARGET_DIR }}
-        run: |
-          syft dir:. -o json > sbom.json
-
-      - name: Show SBOM contents
-        working-directory: ${{ env.TARGET_DIR }}
-        run: |
-          echo "Packages discovered by Syft:"
-          jq -r '.artifacts[] | "\(.name)@\(.version) [\(.type)]"' sbom.json | sort
-
-      # Composite actions run from the workspace root, so pass the target and
-      # report relative to it (TARGET_DIR is "." for most repositories).
-      - name: Scan SBOM with Grype
-        id: audit
-        continue-on-error: true
-        uses: https://git.sysmd.uk/mdaleo404/actions/scan-image@v1
-        with:
-          target: sbom:${{ env.TARGET_DIR }}/sbom.json
-          severities: Medium,High,Critical
-          report-path: ${{ env.TARGET_DIR }}/grype.json
-
-      - name: Show full Grype table
-        working-directory: ${{ env.TARGET_DIR }}
-        run: |
-          echo "Full Grype report:"
-          grype sbom:sbom.json -o table
-
-      - name: Notify Node-RED on vulnerabilities
-        if: steps.audit.outcome == 'failure'
-        working-directory: ${{ env.TARGET_DIR }}
-        run: |
-          jq '
-          {
-            repo: "guardutils/resrm",
-            summary: (
-              "Total: " +
-              (
-                [
-                  .matches[]
-                  | select((.vulnerability.fix.versions | length) > 0)
-                ] | length | tostring
-              )
-            ),
-            vulnerabilities: [
-              .matches[]
-              | select((.vulnerability.fix.versions | length) > 0)
-              | {
-                library: .artifact.name,
-                cve: .vulnerability.id,
-                severity: .vulnerability.severity,
-                installed: .artifact.version,
-                fixed: (.vulnerability.fix.versions[0]),
-                title: .vulnerability.description,
-                url: .vulnerability.dataSource
-              }
-            ]
-          }
-          ' grype.json \
-          | curl -s -X POST https://nodered.sysmd.uk/vulns-alert \
-              -H "Content-Type: application/json" \
-              --data-binary @-
-
-      - name: Fail workflow if vulnerabilities found
-        if: steps.audit.outcome == 'failure'
-        run: exit 1

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Lint & Security
+name: CI
 
 on:
   pull_request:
@@ -12,7 +12,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  precommit-and-security:
+  lint-and-security:
     name: lint-and-security
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -70,8 +70,9 @@ jobs:
             | "\($d.name)@\($d.version) -> \(.id) [fix: \(if (.fix_versions | length) > 0 then (.fix_versions | join(", ")) else "none" end)]"
           ' pip-audit.json
 
-          # Fail only on fixable findings (mirrors the Grype policy in security-scan.yml).
-          # The type guard ensures a crashed/empty report fails rather than silently passing.
+          # Fail only on fixable findings. The type guard ensures a crashed or empty
+          # report fails rather than silently passing. Dependency security updates
+          # are handled by the central Renovate job.
           jq -e '
             (.dependencies | type) == "array"
             and
@@ -82,6 +83,10 @@ jobs:
     name: tests
     runs-on: ubuntu-latest
     timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.11", "3.13"]
 
     steps:
       - name: Checkout code
@@ -92,7 +97,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Poetry
         run: pip install "poetry>=2,<3"

DEVELOPMENT.md

@@ -67,7 +67,7 @@ poetry.lock                locked dependency graph
 README.md                  user-facing documentation
 LICENCE                    GPL-3.0-or-later licence text
 .pre-commit-config.yaml    Bandit, Black, and generic pre-commit hooks
-.gitea/workflows/          lint, dependency audit, SBOM and Grype workflows
+.gitea/workflows/          lint and dependency-audit workflows
 dist/                      built release artifacts, not source
 ```
 
@@ -529,17 +529,6 @@ Gitea pull request workflow:
      -> poetry run pytest
 ```
 
-Scheduled/manual security workflow:
-
-```text
-.gitea/workflows/security-scan.yml
-  -> install verified Cosign, Syft, and Grype
-  -> generate SBOM
-  -> scan for vulnerabilities
-  -> notify Node-RED on fixable Medium/High/Critical vulnerabilities
-  -> fail workflow on those vulnerabilities
-```
-
 Pre-commit currently includes Bandit, Black, trailing whitespace, EOF, YAML, and TOML checks.
 
 Bandit is configured for `src/resrm/` with: