From 6f75277d00ac1b54c0899507e635ac144f54fdee Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 20 Sep 2016 10:24:28 +0200 Subject: [PATCH] some cleanups Signed-off-by: Antonio Murdaca --- HACKING.md | 6 ------ Makefile | 12 ++---------- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 HACKING.md diff --git a/HACKING.md b/HACKING.md deleted file mode 100644 index 3e92c998..00000000 --- a/HACKING.md +++ /dev/null @@ -1,6 +0,0 @@ -# Add a new dependency - -``` -$ glide get github.com/example/pkg -$ make udpate-deps -``` diff --git a/Makefile b/Makefile index ed3cec7d..3e6d52a6 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ help: @echo " * 'binaries' - Build ocid, conmon and ocic" @echo " * 'clean' - Clean artifacts" @echo " * 'lint' - Execute the source code linter" - @echo " * 'update-deps' - Update vendored dependencies" lint: @echo "checking lint" @@ -27,13 +26,6 @@ clean: rm -f ocic ocid rm -f conmon/conmon.o conmon/conmon -update-deps: - @which glide > /dev/null 2>/dev/null || (echo "ERROR: glide not found." && false) - glide update --strip-vcs --strip-vendor --update-vendored --delete - glide-vc --only-code --no-tests - # see http://sed.sourceforge.net/sed1line.txt - find vendor -type f -exec sed -i -e :a -e '/^\n*$$/{$$d;N;ba' -e '}' "{}" \; - binaries: ocid ocic conmon .PHONY: .gitvalidation @@ -41,9 +33,9 @@ binaries: ocid ocic conmon .gitvalidation: @which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false) ifeq ($(TRAVIS),true) - git-validation -q -run DCO,short-subject,dangling-whitespace + git-validation -q -run DCO,short-subject else - git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD + git-validation -v -run DCO,short-subject -range $(EPOCH_TEST_COMMIT)..HEAD endif .PHONY: install.tools