X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ed6fda696864be2b0970ec1eae327f48c00f7fd1..c41f2fed2133668dc3179813261d39d3ff69cbdd:/.github/workflows/ci-tests.yml?ds=inline diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 6ebf1ab9..42c03edc 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -7,11 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: submodules: true - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | data/country_osm_grid.sql.gz @@ -27,7 +27,7 @@ jobs: mv nominatim-src.tar.bz2 Nominatim - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: full-source path: nominatim-src.tar.bz2 @@ -37,23 +37,31 @@ jobs: needs: create-archive strategy: matrix: - ubuntu: [18, 20] + flavour: [oldstuff, "ubuntu-20", "ubuntu-22"] include: - - ubuntu: 18 - postgresql: 9.6 - postgis: 2.5 - pytest: pytest - php: 7.2 - - ubuntu: 20 + - flavour: oldstuff + ubuntu: 20 + postgresql: '9.6' + postgis: '2.5' + php: '7.3' + lua: '5.1' + - flavour: ubuntu-20 + ubuntu: 20 postgresql: 13 postgis: 3 - pytest: py.test-3 - php: 7.4 + php: '7.4' + lua: '5.3' + - flavour: ubuntu-22 + ubuntu: 22 + postgresql: 15 + postgis: 3 + php: '8.1' + lua: '5.3' runs-on: ubuntu-${{ matrix.ubuntu }}.04 steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: full-source @@ -64,12 +72,15 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - tools: phpunit, phpcs, composer + tools: phpunit:9, phpcs, composer + ini-values: opcache.jit=disable + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: - python-version: 3.6 - if: matrix.ubuntu == 18 + python-version: 3.7 + if: matrix.flavour == 'oldstuff' - uses: ./Nominatim/.github/actions/setup-postgresql with: @@ -78,57 +89,74 @@ jobs: - uses: ./Nominatim/.github/actions/build-nominatim with: - ubuntu: ${{ matrix.ubuntu }} + flavour: ${{ matrix.flavour }} + lua: ${{ matrix.lua }} - - name: Install test prerequsites - run: sudo apt-get install -y -qq pylint python3-pytest python3-behave - if: matrix.ubuntu == 20 + - name: Install test prerequsites (behave from apt) + run: sudo apt-get install -y -qq python3-behave + if: matrix.flavour == 'ubuntu-20' - - name: Install test prerequsites - run: pip3 install pylint==2.6.0 pytest behave==1.2.6 - if: matrix.ubuntu == 18 + - name: Install test prerequsites (behave from pip) + run: pip3 install behave==1.2.6 + if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22') + + - name: Install test prerequsites (from apt for Ununtu 2x) + run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn + if: matrix.flavour != 'oldstuff' + + - name: Install newer pytest-asyncio + run: pip3 install -U pytest-asyncio==0.21.1 + if: matrix.flavour == 'ubuntu-20' + + - name: Install test prerequsites (from pip for Ubuntu 18) + run: pip3 install pytest pytest-asyncio uvicorn + if: matrix.flavour == 'oldstuff' + + - name: Install Python webservers + run: pip3 install falcon starlette asgi_lifespan + + - name: Install latest pylint + run: pip3 install -U pylint + if: matrix.flavour != 'oldstuff' - name: PHP linting run: phpcs --report-width=120 . working-directory: Nominatim + if: matrix.flavour != 'oldstuff' - name: Python linting - run: pylint nominatim + run: python3 -m pylint nominatim working-directory: Nominatim + if: matrix.flavour != 'oldstuff' - name: PHP unit tests run: phpunit ./ working-directory: Nominatim/test/php - if: matrix.ubuntu == 20 - name: Python unit tests - run: $PYTEST test/python + run: python3 -m pytest test/python working-directory: Nominatim - env: - PYTEST: ${{ matrix.pytest }} - name: BDD tests run: | - behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 + python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 working-directory: Nominatim/test/bdd + - name: Install mypy and typechecking info + run: pip3 install -U mypy osmium uvicorn types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests types-ujson types-Pygments typing-extensions + if: matrix.flavour != 'oldstuff' - icu-test: - needs: create-archive - strategy: - matrix: - ubuntu: [20] - include: - - ubuntu: 20 - postgresql: 13 - postgis: 3 - pytest: py.test-3 - php: 7.4 + - name: Python static typechecking + run: python3 -m mypy --strict nominatim + working-directory: Nominatim + if: matrix.flavour != 'oldstuff' - runs-on: ubuntu-${{ matrix.ubuntu }}.04 + legacy-test: + needs: create-archive + runs-on: ubuntu-20.04 steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: full-source @@ -138,35 +166,59 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} - coverage: xdebug - tools: phpunit, phpcs, composer + php-version: '7.4' + + - uses: ./Nominatim/.github/actions/setup-postgresql + with: + postgresql-version: 13 + postgis-version: 3 + + - name: Install Postgresql server dev + run: sudo apt-get install postgresql-server-dev-13 + + - uses: ./Nominatim/.github/actions/build-nominatim + with: + cmake-args: -DBUILD_MODULE=on - - uses: actions/setup-python@v2 + - name: Install test prerequsites + run: sudo apt-get install -y -qq python3-behave + + - name: BDD tests (legacy tokenizer) + run: | + python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3 + working-directory: Nominatim/test/bdd + + + python-api-test: + needs: create-archive + runs-on: ubuntu-22.04 + + steps: + - uses: actions/download-artifact@v3 with: - python-version: 3.6 - if: matrix.ubuntu == 18 + name: full-source + + - name: Unpack Nominatim + run: tar xf nominatim-src.tar.bz2 - uses: ./Nominatim/.github/actions/setup-postgresql with: - postgresql-version: ${{ matrix.postgresql }} - postgis-version: ${{ matrix.postgis }} + postgresql-version: 15 + postgis-version: 3 - uses: ./Nominatim/.github/actions/build-nominatim with: - ubuntu: ${{ matrix.ubuntu }} + flavour: 'ubuntu-22' - name: Install test prerequsites run: sudo apt-get install -y -qq python3-behave - if: matrix.ubuntu == 20 - - name: Install test prerequsites - run: pip3 install behave==1.2.6 - if: matrix.ubuntu == 18 + - name: Install Python webservers + run: pip3 install starlette asgi_lifespan httpx - - name: BDD tests (icu tokenizer) + - name: BDD tests (starlette) run: | - behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=icu --format=progress3 + python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=starlette --format=progress3 working-directory: Nominatim/test/bdd @@ -176,18 +228,16 @@ jobs: strategy: matrix: - name: [Ubuntu-18, Ubuntu-20] + name: [Ubuntu-20, Ubuntu-22] include: - - name: Ubuntu-18 - flavour: ubuntu - image: "ubuntu:18.04" - ubuntu: 18 - install_mode: install-nginx - name: Ubuntu-20 - flavour: ubuntu image: "ubuntu:20.04" ubuntu: 20 install_mode: install-apache + - name: Ubuntu-22 + image: "ubuntu:22.04" + ubuntu: 22 + install_mode: install-apache container: image: ${{ matrix.image }} @@ -207,14 +257,6 @@ jobs: apt-get install -y git sudo wget ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone shell: bash - if: matrix.flavour == 'ubuntu' - - - name: Prepare container (CentOS) - run: | - dnf update -y - dnf install -y sudo glibc-langpack-en - shell: bash - if: matrix.flavour == 'centos' - name: Setup import user run: | @@ -226,7 +268,7 @@ jobs: OS: ${{ matrix.name }} INSTALL_MODE: ${{ matrix.install_mode }} - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: full-source path: /home/nominatim @@ -244,22 +286,25 @@ jobs: - name: Prepare import environment run: | mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf + mv Nominatim/settings/flex-base.lua flex-base.lua + 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 import environment (CentOS) - run: | - sudo ln -s /usr/local/bin/nominatim /usr/bin/nominatim - echo NOMINATIM_DATABASE_WEBUSER="apache" > nominatim-project/.env - cp nominatim-project/.env data-env-reverse/.env - working-directory: /home/nominatim - if: matrix.flavour == 'centos' - - name: Print version run: nominatim --version working-directory: /home/nominatim/nominatim-project + - name: Print taginfo + run: lua taginfo.lua + working-directory: /home/nominatim + + - name: Collect host OS information + run: nominatim admin --collect-os-info + working-directory: /home/nominatim/nominatim-project + - name: Import run: nominatim import --osm-file ../test.pbf working-directory: /home/nominatim/nominatim-project @@ -279,7 +324,6 @@ jobs: - name: Prepare update (Ubuntu) run: apt-get install -y python3-pip shell: bash - if: matrix.flavour == 'ubuntu' - name: Run update run: | @@ -305,3 +349,95 @@ jobs: - name: Clean up database (reverse-only import) run: nominatim refresh --postcodes --word-tokens working-directory: /home/nominatim/nominatim-project + + install-no-superuser: + runs-on: ubuntu-latest + needs: create-archive + + strategy: + matrix: + name: [Ubuntu-22] + include: + - name: Ubuntu-22 + image: "ubuntu:22.04" + ubuntu: 22 + install_mode: install-apache + + container: + 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: + OS: ${{ matrix.name }} + INSTALL_MODE: ${{ matrix.install_mode }} + + - uses: actions/download-artifact@v3 + with: + name: full-source + path: /home/nominatim + + - name: Install Nominatim + run: | + export USERNAME=nominatim + export USERHOME=/home/nominatim + export NOSYSTEMD=yes + export HAVE_SELINUX=no + tar xf nominatim-src.tar.bz2 + . vagrant.sh + working-directory: /home/nominatim + + - name: Prepare import environment + run: | + mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf + mv Nominatim/settings/flex-base.lua flex-base.lua + 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 + run: | + nominatim import --prepare-database + working-directory: /home/nominatim/nominatim-project + + - name: Create import user + run: | + sudo -u postgres createuser -S osm-import + sudo -u postgres psql -c "ALTER USER \"osm-import\" WITH PASSWORD 'osm-import';" + 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:host=127.0.0.1;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 \ No newline at end of file