diff --git a/.github/workflows/python_checks.yaml b/.github/workflows/pr_check.yaml similarity index 55% rename from .github/workflows/python_checks.yaml rename to .github/workflows/pr_check.yaml index 43781eb..9cb33a4 100644 --- a/.github/workflows/python_checks.yaml +++ b/.github/workflows/pr_check.yaml @@ -1,18 +1,42 @@ --- -name: Python tests +name: PR Check on: pull_request: branches: - master + push: + branches: + - master jobs: - build: + pre-commit: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.12' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip setuptools wheel + pip install -r build-requirements.txt + pip install pre-commit + + - name: Run pre-commit + run: pre-commit run --all-files + + python-tests: + needs: pre-commit runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python uses: actions/setup-python@v4 diff --git a/.github/workflows/pre_commit_check.yaml b/.github/workflows/pre_commit_check.yaml deleted file mode 100644 index 4a21d3b..0000000 --- a/.github/workflows/pre_commit_check.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -name: Pre-commit hooks - -on: - pull_request: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.12' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip setuptools wheel - pip install -r build-requirements.txt - pip install pre-commit - - - name: Run pre-commit - run: pre-commit run --all-files