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