mirror of
https://github.com/minio/minio.git
synced 2025-01-14 08:15:01 -05:00
Merge pull request #464 from harshavardhana/pr_out_fix_build_for_travis
This commit is contained in:
commit
87e4755282
6
Makefile
6
Makefile
@ -1,5 +1,3 @@
|
|||||||
MINIOPATH=$(GOPATH)/src/github.com/minio-io/minio
|
|
||||||
|
|
||||||
all: getdeps install
|
all: getdeps install
|
||||||
|
|
||||||
checkdeps:
|
checkdeps:
|
||||||
@ -7,8 +5,8 @@ checkdeps:
|
|||||||
@(env bash $(PWD)/buildscripts/checkdeps.sh)
|
@(env bash $(PWD)/buildscripts/checkdeps.sh)
|
||||||
|
|
||||||
checkgopath:
|
checkgopath:
|
||||||
@echo "Checking if project is at ${MINIOPATH}"
|
@echo "Checking if project is at ${GOPATH}"
|
||||||
@if [ ! -d ${MINIOPATH} ]; then echo "Project not found in $GOPATH, please follow instructions provided at https://github.com/Minio-io/minio/blob/master/CONTRIBUTING.md#setup-your-minio-github-repository" && exit 1; fi
|
@for mcpath in $(echo ${GOPATH} | sed 's/:/\n/g' | grep -v Godeps); do if [ ! -d ${mcpath}/src/github.com/minio-io/minio ]; then echo "Project not found in ${mcpath}, please follow instructions provided at https://github.com/Minio-io/minio/blob/master/CONTRIBUTING.md#setup-your-minio-github-repository" && exit 1; fi done
|
||||||
|
|
||||||
getdeps: checkdeps checkgopath
|
getdeps: checkdeps checkgopath
|
||||||
@go get github.com/minio-io/godep && echo "Installed godep:"
|
@go get github.com/minio-io/godep && echo "Installed godep:"
|
||||||
|
@ -159,10 +159,6 @@ check_deps() {
|
|||||||
MISSING="${MISSING} yasm(1.2.0)"
|
MISSING="${MISSING} yasm(1.2.0)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
env mkdocs help >/dev/null 2>&1
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
MISSING="${MISSING} mkdocs"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
|
Loading…
Reference in New Issue
Block a user