Simplify CI

euclio · Jul 19, 2020 · 468aaf9 · 468aaf9
1 parent 9de13bc
commit 468aaf9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,20 +5,6 @@ general:
       - /binary-.*/
 
 jobs:
-  lint:
-    docker:
-      - image: circleci/rust:latest
-    steps:
-      - checkout
-      - run: |
-          rustup component add clippy
-          cargo clippy --all -- --deny warnings
-  format:
-    docker:
-      - image: circleci/rust:latest
-    steps:
-      - checkout
-      - run: cargo fmt -- --check
   build:
     docker:
       - image: autozimu/languageclientneovim

diff --git a/Makefile b/Makefile
@@ -2,21 +2,21 @@ all: release
 
 dev: build fmt clippy vint
 
-ci: vint python-lint test integration-test
-	cargo fmt -- --check
+ci: vint python-lint check-fmt-and-clippy test integration-test
 
 check:
 	cargo check
 
+check-fmt-and-clippy: check
+	cargo fmt -- --check
+	cargo clippy --all -- --deny warnings
+
 build:
 	cargo build
 
 fmt:
 	cargo fmt
 
-clippy:
-	cargo clippy
-
 vint:
 	vint autoload plugin