Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# CI/CD Workflows

## Main CI (single job)

| Workflow | Trigger | Purpose |
|----------|---------|---------|
| **ci.yml** | PRs and pushes to `main` / `develop` | One job: Python 3.12, pytest + ruff (check + format) + mypy + integration tests (`test_templates.py`). Single green check per run. |

All testing and linting for PRs and main/develop runs in this one workflow. No matrix, no separate “Enhanced” or “PR Tests” jobs.

## Other workflows

| Workflow | Trigger | Purpose |
|----------|---------|---------|
| **publish.yml** | Release | Publish package. |
| **ci-error-analysis.yaml** | — | Error analysis (if used). |

## Removed (consolidated into ci.yml)

- **pr-test.yml** — merged into ci.yml
- **test-enhanced.yml** — matrix and reporting removed; single Python 3.12 in ci.yml
- **test.yml** (Push Tests) — same steps now in ci.yml on push
- **integration-tests.yml** — integration step runs inside ci.yml
- **feature-test.yml** — removed; open a PR to run CI on feature branches
57 changes: 57 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Consolidated CI: one job, latest Python. Runs on every PR and push to main/develop.
name: CI

on:
pull_request:
branches: [main, develop]
push:
branches: [main, develop]

concurrency:
group: ci-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: "3.12"

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install ".[dev]"

- name: Run tests
run: |
python -m pytest tests/ -v --tb=short --junitxml=test-results.xml --cov=oas_cli --cov-report=term-missing --cov-report=xml

- name: Ruff (check + format)
run: |
ruff check . --exclude test_output/
ruff format --check . --exclude test_output/

- name: Mypy
run: |
mypy oas_cli tests

- name: Integration tests (templates)
run: |
python tests/integration/test_templates.py

- name: Upload test results
uses: actions/upload-artifact@v4
if: always()
with:
name: test-results
path: |
test-results.xml
coverage.xml
test_output/
retention-days: 7
272 changes: 0 additions & 272 deletions .github/workflows/feature-test.yml

This file was deleted.

39 changes: 0 additions & 39 deletions .github/workflows/integration-tests.yml

This file was deleted.

Loading