From 468aaf93cd5358ce8b2f779967e3261f772326e8 Mon Sep 17 00:00:00 2001
From: Junfeng Li <autozimu@gmail.com>
Date: Sun, 19 Jul 2020 23:59:04 +0000
Subject: [PATCH] Simplify CI

---
 .circleci/config.yml | 14 --------------
 Makefile             | 10 +++++-----
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c9101d107..3b57f4d14 100644
--- 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
index 08a57c2c6..e7cca1565 100644
--- 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