From baadf7769c057b723a2ffef4d07d2662abd17c65 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Sat, 21 Mar 2015 22:52:39 -0300 Subject: [PATCH] Renamed travis_install to ci_install --- Makefile | 11 ++++++----- circle.yml | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4b19d47..d1d37b3 100644 --- a/Makefile +++ b/Makefile @@ -11,12 +11,9 @@ all: pip install wheel pip wheel --wheel-dir=$(WHEEL_DIR) . -install: all +install: pip install --use-wheel --no-index --find-links=$(WHEEL_DIR) . -test_install: install_solr - pip install flake8 - install_solr: install # Install java which apt-get && sudo apt-get install default-jre -y || echo # deb @@ -25,7 +22,11 @@ install_solr: install colab-admin build_solr_schema > /tmp/schema.xml SOLR_VERSION=4.10.3 SOLR_CONFS="/tmp/schema.xml" ci/install_solr.sh -travis_install: test_install +test_install: install_solr + pip install flake8 + +ci_install: test_install + dropdb test_colab --if-exists -U postgres psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres test: diff --git a/circle.yml b/circle.yml index f06cd54..88b1031 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,8 @@ dependencies: override: - - make travis_install + - make + - make ci_install cache_directories: - ".colab-wheel/" -- libgit2 0.21.2