From 7b8f6b907910d4982189fd203448a48ceb87bb06 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Fri, 8 Oct 2021 08:46:15 -0400 Subject: Combine the CI and precommit workflows. --- .github/workflows/ci.yml | 7 +++++++ .github/workflows/pre-commit.yml | 13 ------------- 2 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 .github/workflows/pre-commit.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ab588e..2155960 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,6 +10,13 @@ on: - cron: '21 3 * * *' jobs: + pre-commit: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - uses: pre-commit/action@v2.0.0 + ci: runs-on: ${{ matrix.os }} strategy: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml deleted file mode 100644 index 306e1ad..0000000 --- a/.github/workflows/pre-commit.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: pre-commit - -on: - pull_request: - push: - -jobs: - pre-commit: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - - uses: pre-commit/action@v2.0.0 -- cgit v1.2.1