Skip to content

Commit

Permalink
[make] refs skycoin#51 Update some makefile targets
Browse files Browse the repository at this point in the history
  • Loading branch information
stdevMac committed May 18, 2019
1 parent ada5e67 commit 75f9949
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@ install:
- go get -t ./...
- make install-linters
- VERSION=1.10.2 ./ci-scripts/install-golangci-lint.sh
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then DEPS_DIR="${TRAVIS_BUILD_DIR}/deps" && mkdir ${DEPS_DIR} && cd ${DEPS_DIR} && travis_retry wget --no-check-certificate https://cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz && echo "f3546812c11ce7f5d64dc132a566b749 *cmake-3.3.2-Linux-x86_64.tar.gz" > cmake_md5.txt && md5sum -c cmake_md5.txt && tar -xvf cmake-3.3.2-Linux-x86_64.tar.gz > /dev/null && mv cmake-3.3.2-Linux-x86_64 cmake-install && PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH && cd ${TRAVIS_BUILD_DIR}; fi
- make install-deps-libc
- make install-lib-curl
- make install-deps-skyapi

script:
- make check

notifications:
email: false
webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
17 changes: 13 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,16 +166,25 @@ install-linters: install-linters-$(UNAME_S) ## Install linters
go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
VERSION=1.10.2 ./ci-scripts/install-golangci-lint.sh

install-deps-libc: install-deps-libc-$(OSNAME) install-libraries-deps
install-deps-skyapi-Linux:
sudo add-apt-repository ppa:george-edison55/cmake-3.x
sudo apt-get update
sudo apt-get install cmake

install-deps-skyapi-Darwin:
brew install curl
brew install cmake
ls

install-deps-libc: install-deps-libc-$(OSNAME)

install-deps-skyapi: install-deps-skyapi-$(OSNAME)

install-deps-libc-linux: configure-build ## Install locally dependencies for testing libskycoin
wget -c https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz
tar -xzf check-0.12.0.tar.gz
cd check-0.12.0 && ./configure --prefix=/usr --disable-static && make && sudo make install

install-lib-curl: ## Install Sky Api curl based rest wrapper
bash .travis/install_lib_curl.sh

install-deps-libc-osx: configure-build ## Install locally dependencies for testing libskycoin
brew install check

Expand Down

0 comments on commit 75f9949

Please sign in to comment.