Renamed travis_install to ci_install

Sergio Oliveira
1 parent 261e30b5
Showing 2 changed files with 8 additions and 6 deletions Show diff stats
Makefile
circle.yml
@@ -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:
  
 dependencies:
   override:
-    - make travis_install
+    - make
+    - make ci_install
  
   cache_directories:
     - ".colab-wheel/"
...	...	@@ -11,12 +11,9 @@ all:
11	11	pip install wheel
12	12	pip wheel --wheel-dir=$(WHEEL_DIR) .
13	13
14		-install: all
	14	+install:
15	15	pip install --use-wheel --no-index --find-links=$(WHEEL_DIR) .
16	16
17		-test_install: install_solr
18		- pip install flake8
19		-
20	17	install_solr: install
21	18	# Install java
22	19	which apt-get && sudo apt-get install default-jre -y \|\| echo # deb
...	...	@@ -25,7 +22,11 @@ install_solr: install
25	22	colab-admin build_solr_schema > /tmp/schema.xml
26	23	SOLR_VERSION=4.10.3 SOLR_CONFS="/tmp/schema.xml" ci/install_solr.sh
27	24
28		-travis_install: test_install
	25	+test_install: install_solr
	26	+ pip install flake8
	27	+
	28	+ci_install: test_install
	29	+ dropdb test_colab --if-exists -U postgres
29	30	psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
30	31
31	32	test:
...	...