hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed formatting

Browse Source
This commit is contained in:
Robbe Haesendonck
2023-09-27 10:37:57 +02:00
committed by Sarah Hoffmann
parent 3b09c39dbf
commit 58db0ad6d8
1 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
.github/workflows/ci-tests.yml vendored
View File

@@ -350,93 +350,93 @@ jobs:
run: nominatim refresh --postcodes --word-tokens run: nominatim refresh --postcodes --word-tokens
working-directory: /home/nominatim/nominatim-project working-directory: /home/nominatim/nominatim-project
install-no-superuser: install-no-superuser:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: create-archive needs: create-archive
strategy: strategy:
matrix: matrix:
name: [Ubuntu-22] name: [Ubuntu-22]
include: include:
- name: Ubuntu-22 - name: Ubuntu-22
image: "ubuntu:22.04" image: "ubuntu:22.04"
ubuntu: 22 ubuntu: 22
install_mode: install-apache install_mode: install-apache
container: container:
image: ${{ matrix.image }} image: ${{ matrix.image }}
env:
LANG: en_US.UTF-8
defaults:
run:
shell: sudo -Hu nominatim bash --noprofile --norc -eo pipefail {0}
steps:
- name: Prepare container (Ubuntu)
run: |
export APT_LISTCHANGES_FRONTEND=none
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get install -y git sudo wget
ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
shell: bash
- name: Setup import user
run: |
useradd -m nominatim
echo 'nominatim ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/nominiatim
echo "/home/nominatim/Nominatim/vagrant/Install-on-${OS}.sh no $INSTALL_MODE" > /home/nominatim/vagrant.sh
shell: bash
env: env:
LANG: en_US.UTF-8 OS: ${{ matrix.name }}
INSTALL_MODE: ${{ matrix.install_mode }}
defaults: - uses: actions/download-artifact@v3
run: with:
shell: sudo -Hu nominatim bash --noprofile --norc -eo pipefail {0} name: full-source
path: /home/nominatim
steps: - name: Install Nominatim
- name: Prepare container (Ubuntu) run: |
run: | export USERNAME=nominatim
export APT_LISTCHANGES_FRONTEND=none export USERHOME=/home/nominatim
export DEBIAN_FRONTEND=noninteractive export NOSYSTEMD=yes
apt-get update -qq export HAVE_SELINUX=no
apt-get install -y git sudo wget tar xf nominatim-src.tar.bz2
ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone . vagrant.sh
shell: bash working-directory: /home/nominatim
- name: Setup import user - name: Prepare import environment
run: | run: |
useradd -m nominatim mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf
echo 'nominatim ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/nominiatim mv Nominatim/settings/flex-base.lua flex-base.lua
echo "/home/nominatim/Nominatim/vagrant/Install-on-${OS}.sh no $INSTALL_MODE" > /home/nominatim/vagrant.sh mv Nominatim/settings/import-extratags.lua import-extratags.lua
shell: bash mv Nominatim/settings/taginfo.lua taginfo.lua
env: rm -rf Nominatim
OS: ${{ matrix.name }} mkdir data-env-reverse
INSTALL_MODE: ${{ matrix.install_mode }} working-directory: /home/nominatim
- uses: actions/download-artifact@v3 - name: Prepare Database
with: run: |
name: full-source nominatim import --prepare-database
path: /home/nominatim working-directory: /home/nominatim/nominatim-project
- name: Install Nominatim - name: Create import user
run: | run: |
export USERNAME=nominatim sudo -u postgres createuser -S osm-import -P osm-import
export USERHOME=/home/nominatim working-directory: /home/nominatim/nominatim-project
export NOSYSTEMD=yes
export HAVE_SELINUX=no
tar xf nominatim-src.tar.bz2
. vagrant.sh
working-directory: /home/nominatim
- name: Prepare import environment - name: Grant import user rights
run: | run: |
mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf sudo -u postgres psql -c "GRANT INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO \"osm-import\";"
mv Nominatim/settings/flex-base.lua flex-base.lua working-directory: /home/nominatim/nominatim-project
mv Nominatim/settings/import-extratags.lua import-extratags.lua
mv Nominatim/settings/taginfo.lua taginfo.lua
rm -rf Nominatim
mkdir data-env-reverse
working-directory: /home/nominatim
- name: Prepare Database - name: Run import
run: | run: |
nominatim import --prepare-database NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim;user=osm-import;password=osm-import" nominatim import --continue import-from-file --osm-file ../test.pbf
working-directory: /home/nominatim/nominatim-project working-directory: /home/nominatim/nominatim-project
- name: Create import user - name: Check full import
run: | run: nominatim admin --check-database
sudo -u postgres createuser -S osm-import -P osm-import working-directory: /home/nominatim/nominatim-project
working-directory: /home/nominatim/nominatim-project
- name: Grant import user rights
run: |
sudo -u postgres psql -c "GRANT INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO \"osm-import\";"
working-directory: /home/nominatim/nominatim-project
- name: Run import
run: |
NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim;user=osm-import;password=osm-import" nominatim import --continue import-from-file --osm-file ../test.pbf
working-directory: /home/nominatim/nominatim-project
- name: Check full import
run: nominatim admin --check-database
working-directory: /home/nominatim/nominatim-project