summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2021-10-08 08:46:15 -0400
committerJulian Berman <Julian@GrayVines.com>2021-10-08 08:46:27 -0400
commit7b8f6b907910d4982189fd203448a48ceb87bb06 (patch)
treea0278707b8930451bbe41d21cebb82bc5e564beb /.github
parentff95ee4891fedb03e6855c57c9e1c8bb928234ca (diff)
downloadjsonschema-7b8f6b907910d4982189fd203448a48ceb87bb06.tar.gz
Combine the CI and precommit workflows.
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml7
-rw-r--r--.github/workflows/pre-commit.yml13
2 files changed, 7 insertions, 13 deletions
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