some cleanups
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
parent
c268bf28b0
commit
6f75277d00
2 changed files with 2 additions and 16 deletions
|
@ -1,6 +0,0 @@
|
||||||
# Add a new dependency
|
|
||||||
|
|
||||||
```
|
|
||||||
$ glide get github.com/example/pkg
|
|
||||||
$ make udpate-deps
|
|
||||||
```
|
|
12
Makefile
12
Makefile
|
@ -8,7 +8,6 @@ help:
|
||||||
@echo " * 'binaries' - Build ocid, conmon and ocic"
|
@echo " * 'binaries' - Build ocid, conmon and ocic"
|
||||||
@echo " * 'clean' - Clean artifacts"
|
@echo " * 'clean' - Clean artifacts"
|
||||||
@echo " * 'lint' - Execute the source code linter"
|
@echo " * 'lint' - Execute the source code linter"
|
||||||
@echo " * 'update-deps' - Update vendored dependencies"
|
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
@echo "checking lint"
|
@echo "checking lint"
|
||||||
|
@ -27,13 +26,6 @@ clean:
|
||||||
rm -f ocic ocid
|
rm -f ocic ocid
|
||||||
rm -f conmon/conmon.o conmon/conmon
|
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
|
binaries: ocid ocic conmon
|
||||||
|
|
||||||
.PHONY: .gitvalidation
|
.PHONY: .gitvalidation
|
||||||
|
@ -41,9 +33,9 @@ binaries: ocid ocic conmon
|
||||||
.gitvalidation:
|
.gitvalidation:
|
||||||
@which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false)
|
@which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false)
|
||||||
ifeq ($(TRAVIS),true)
|
ifeq ($(TRAVIS),true)
|
||||||
git-validation -q -run DCO,short-subject,dangling-whitespace
|
git-validation -q -run DCO,short-subject
|
||||||
else
|
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
|
endif
|
||||||
|
|
||||||
.PHONY: install.tools
|
.PHONY: install.tools
|
||||||
|
|
Loading…
Reference in a new issue