hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1962 from mtmail/travis-ci-without-webserver

Browse Source 
travis-ci: we dont need Apache installed
This commit is contained in:
Sarah Hoffmann
2020-09-17 20:38:17 +02:00
committed by GitHub
parent df115c73b2 9e21c6a862
commit b8ced5d96b
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -15,7 +15,7 @@ env:
before_install: before_install:
- phpenv global 7.4 - phpenv global 7.4
install: install:
- vagrant/install-on-travis-ci.sh - vagrant/Install-on-Travis-CI.sh
before_script: before_script:
- psql -U postgres -c "create extension postgis" - psql -U postgres -c "create extension postgis"
script: script:

19
vagrant/install-on-travis-ci.sh → vagrant/Install-on-Travis-CI.sh
View File

@@ -18,7 +18,7 @@ sudo apt-get install -y -qq build-essential cmake g++ libboost-dev libboost-syst
libbz2-dev libpq-dev libproj-dev \ libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-12 postgresql-12-postgis-3 \ postgresql-server-dev-12 postgresql-12-postgis-3 \
postgresql-contrib postgresql-12-postgis-3-scripts \ postgresql-contrib postgresql-12-postgis-3-scripts \
apache2 php php-pgsql libapache2-mod-php \ php php-pgsql \
php-intl python3-setuptools python3-dev python3-pip \ php-intl python3-setuptools python3-dev python3-pip \
python3-psycopg2 python3-tidylib git python3-psycopg2 python3-tidylib git
@@ -39,22 +39,6 @@ sudo -u postgres createuser -S www-data
chmod a+x $HOME chmod a+x $HOME
chmod a+x $TRAVIS_BUILD_DIR chmod a+x $TRAVIS_BUILD_DIR
sudo tee /etc/apache2/conf-available/nominatim.conf << EOFAPACHECONF > /dev/null
<Directory "$TRAVIS_BUILD_DIR/build/website">
Options FollowSymLinks MultiViews
AddType text/html .php
DirectoryIndex search.php
Require all granted
</Directory>
Alias /nominatim $TRAVIS_BUILD_DIR/build/website
EOFAPACHECONF
sudo a2enconf nominatim
sudo service apache2 restart
wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
mkdir build mkdir build
@@ -65,7 +49,6 @@ make
tee settings/local.php << EOF tee settings/local.php << EOF
<?php <?php
@define('CONST_Website_BaseURL', '/nominatim/');
@define('CONST_Database_DSN', 'pgsql:dbname=test_api_nominatim'); @define('CONST_Database_DSN', 'pgsql:dbname=test_api_nominatim');
@define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/test/testdb'); @define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/test/testdb');
@define('CONST_Replication_Max_Diff_size', '3'); @define('CONST_Replication_Max_Diff_size', '3');