Skip to content

Commit

Permalink
Merge pull request #76 from flatironinstitute/ci/consolidate
Browse files Browse the repository at this point in the history
Collapse github actions into one file, move Jenkinsfile
  • Loading branch information
WardBrian authored Oct 11, 2023
2 parents 2886128 + 6018a6e commit e9e1532
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 45 deletions.
39 changes: 31 additions & 8 deletions .github/workflows/lint.yml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,49 @@
name: lint
name: ci

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

# only run on latest commit
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
mypy_ruff:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
fail-fast: false

steps:
- uses: actions/checkout@v3
- name: Set up Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/[email protected]
with:
python-version: "3.11"
python-version: ${{ matrix.python-version }}

- name: Set up cache
uses: actions/[email protected]
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install .[dev]
- name: Pytest
run: |
pytest tests/ --cov -k "not cuda"
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/[email protected]
with:
path: .venv
key: venv-${{ hashFiles('pyproject.toml', 'requirements.txt') }}
python-version: "3.11"

- name: Install dependencies
run: |
Expand Down
37 changes: 0 additions & 37 deletions .github/workflows/test.yml

This file was deleted.

File renamed without changes.

0 comments on commit e9e1532

Please sign in to comment.