From c78bf094c27cf574254a3bcd05c907c6150fe68b Mon Sep 17 00:00:00 2001 From: Remco de Boer Date: Thu, 8 Apr 2021 13:54:45 +0200 Subject: [PATCH] ci: split ci workflow into docs and style --- .github/workflows/{ci.yml => ci-docs.yml} | 26 ++++++----------------- .github/workflows/ci-style.yml | 25 ++++++++++++++++++++++ .gitignore | 2 -- .vscode/settings.json | 5 ++--- cspell.json | 2 +- docs/.gitignore | 2 ++ 6 files changed, 37 insertions(+), 25 deletions(-) rename .github/workflows/{ci.yml => ci-docs.yml} (58%) create mode 100644 .github/workflows/ci-style.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-docs.yml similarity index 58% rename from .github/workflows/ci.yml rename to .github/workflows/ci-docs.yml index ae1aef63..fb2c3668 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-docs.yml @@ -1,6 +1,4 @@ -# cspell:ignore reqs - -name: CI +name: CI-docs on: push: @@ -26,21 +24,11 @@ jobs: sudo apt-get -y install pandoc graphviz - name: Build documentation and run notebooks working-directory: docs + env: + EXECUTE_NB: YES run: make html - - style: - name: Style checks - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.7 - uses: actions/setup-python@v2 + - uses: actions/upload-artifact@v2 + if: ${{ always() }} with: - python-version: 3.7 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r reqs/3.7/requirements-sty.txt - pip install . - - name: Perform style checks - run: pre-commit run -a + name: html + path: docs/_build/html diff --git a/.github/workflows/ci-style.yml b/.github/workflows/ci-style.yml new file mode 100644 index 00000000..38da2468 --- /dev/null +++ b/.github/workflows/ci-style.yml @@ -0,0 +1,25 @@ +name: CI-style + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + style: + name: Style checks + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - name: Set up Python 3.7 + uses: actions/setup-python@v2 + with: + python-version: 3.7 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r reqs/3.7/requirements-sty.txt + pip install . + - name: Perform style checks + run: pre-commit run -a diff --git a/.gitignore b/.gitignore index 2ad31247..324e953f 100644 --- a/.gitignore +++ b/.gitignore @@ -52,5 +52,3 @@ pyvenv*/ !cspell.json !environment.yml !pyrightconfig.json - -!docs/_static/* diff --git a/.vscode/settings.json b/.vscode/settings.json index 0467ba82..6312cad2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -63,9 +63,8 @@ "rewrap.wrappingColumn": 79, "search.exclude": { "**/tests/**/__init__.py": true, - "docs/tox.ini": true, - "reqs/3.*/*.txt": true, - "tests/tox.ini": true + "*/tox.ini": true, + "reqs/3.*/*.txt": true }, "telemetry.enableCrashReporter": false, "telemetry.enableTelemetry": false diff --git a/cspell.json b/cspell.json index 06feec16..181c3267 100644 --- a/cspell.json +++ b/cspell.json @@ -30,10 +30,10 @@ ".vscode/*", ".vscode/.gitignore", "Makefile", - "docs/adr/*/*", "codecov.yml", "cspell.json", "docs/_templates/*", + "docs/adr/*/*", "docs/conf.py", "pyproject.toml", "pyrightconfig.json", diff --git a/docs/.gitignore b/docs/.gitignore index e447f1e8..018c6f55 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -3,3 +3,5 @@ *build/ api/ bibliography.bib + +!_static/*