X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bcfe817212af3e863af8dd206d27868cbdd65855..a97bfaf26cbe74325d825c132ce4718bc84c37e5:/.github/workflows/ci-tests.yml?ds=inline diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index a26ad000..1cfaf616 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@v4 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@v4 with: name: full-source path: nominatim-src.tar.bz2 @@ -37,45 +37,38 @@ jobs: needs: create-archive strategy: matrix: - ubuntu: [18, 20, 22] + 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' + lua: '5.1' + - flavour: ubuntu-20 + ubuntu: 20 postgresql: 13 postgis: 3 - pytest: py.test-3 - php: 7.4 - - ubuntu: 22 - postgresql: 14 + lua: '5.3' + - flavour: ubuntu-22 + ubuntu: 22 + postgresql: 15 postgis: 3 - pytest: py.test-3 - php: 8.1 + lua: '5.3' runs-on: ubuntu-${{ matrix.ubuntu }}.04 steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: full-source - name: Unpack Nominatim run: tar xf nominatim-src.tar.bz2 - - name: Setup PHP - uses: shivammathur/setup-php@v2 + - uses: actions/setup-python@v5 with: - php-version: ${{ matrix.php }} - tools: phpunit, phpcs, composer - ini-values: opcache.jit=disable - - - uses: actions/setup-python@v2 - with: - python-version: 3.6 - if: matrix.ubuntu == 18 + python-version: 3.7 + if: matrix.flavour == 'oldstuff' - uses: ./Nominatim/.github/actions/setup-postgresql with: @@ -84,59 +77,70 @@ jobs: - uses: ./Nominatim/.github/actions/build-nominatim with: - ubuntu: ${{ matrix.ubuntu }} - - - name: Install test prerequsites - run: sudo apt-get install -y -qq python3-pytest python3-behave - if: matrix.ubuntu == 20 + flavour: ${{ matrix.flavour }} + lua: ${{ matrix.lua }} - - name: Install test prerequsites - run: pip3 install pylint pytest behave==1.2.6 - if: ${{ (matrix.ubuntu == 18) || (matrix.ubuntu == 22) }} + - name: Install test prerequisites (behave from apt) + run: sudo apt-get install -y -qq python3-behave + if: matrix.flavour == 'ubuntu-20' - - name: Install test prerequsites - run: sudo apt-get install -y -qq python3-pytest - if: matrix.ubuntu == 22 + - name: Install test prerequisites (behave from pip) + run: pip3 install behave==1.2.6 + if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22') - - name: Install latest pylint/mypy - run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil typing-extensions + - name: Install test prerequisites (from apt for Ununtu 2x) + run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn + if: matrix.flavour != 'oldstuff' - - name: PHP linting - run: phpcs --report-width=120 . - working-directory: Nominatim + - name: Install newer pytest-asyncio + run: pip3 install -U pytest-asyncio + if: matrix.flavour == 'ubuntu-20' - - name: Python linting - run: pylint nominatim - working-directory: Nominatim + - name: Install test prerequisites (from pip for Ubuntu 18) + run: pip3 install pytest pytest-asyncio uvicorn + if: matrix.flavour == 'oldstuff' - - name: Python static typechecking - run: mypy --strict nominatim - working-directory: Nominatim + - name: Install Python webservers + run: pip3 install falcon starlette asgi_lifespan + - name: Install latest pylint + run: pip3 install -U pylint + if: matrix.flavour == 'ubuntu-22' - - name: PHP unit tests - run: phpunit ./ - working-directory: Nominatim/test/php - if: ${{ (matrix.ubuntu == 20) || (matrix.ubuntu == 22) }} + - name: Python linting + run: python3 -m pylint src + working-directory: Nominatim + if: matrix.flavour == 'ubuntu-22' - 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 + export PATH=$GITHUB_WORKSPACE/build/osm2pgsql:$PATH + python3 -m behave -DREMOVE_TEMPLATE=1 --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' + + - name: Python static typechecking + run: python3 -m mypy --strict src + working-directory: Nominatim + if: matrix.flavour != 'oldstuff' legacy-test: needs: create-archive runs-on: ubuntu-20.04 + strategy: + matrix: + postgresql: ["13", "16"] + steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: full-source @@ -146,27 +150,77 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 7.4 + php-version: '7.4' - uses: ./Nominatim/.github/actions/setup-postgresql with: - postgresql-version: 13 + postgresql-version: ${{ matrix.postgresql }} postgis-version: 3 - name: Install Postgresql server dev - run: sudo apt-get install postgresql-server-dev-13 + run: sudo apt-get install postgresql-server-dev-$PGVER + env: + PGVER: ${{ matrix.postgresql }} - uses: ./Nominatim/.github/actions/build-nominatim with: - ubuntu: 20 cmake-args: -DBUILD_MODULE=on - - name: Install test prerequsites + - name: Install test prerequisites run: sudo apt-get install -y -qq python3-behave - name: BDD tests (legacy tokenizer) run: | - behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3 + export PATH=$GITHUB_WORKSPACE/build/osm2pgsql:$PATH + python3 -m behave -DREMOVE_TEMPLATE=1 -DSERVER_MODULE_PATH=$GITHUB_WORKSPACE/build/module -DAPI_ENGINE=php -DTOKENIZER=legacy --format=progress3 + working-directory: Nominatim/test/bdd + + + php-test: + needs: create-archive + runs-on: ubuntu-22.04 + + steps: + - uses: actions/download-artifact@v4 + with: + name: full-source + + - name: Unpack Nominatim + run: tar xf nominatim-src.tar.bz2 + + - uses: ./Nominatim/.github/actions/setup-postgresql + with: + postgresql-version: 15 + postgis-version: 3 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: 8.1 + tools: phpunit:9, phpcs, composer + ini-values: opcache.jit=disable + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: PHP linting + run: phpcs --report-width=120 . + working-directory: Nominatim + + - name: PHP unit tests + run: phpunit ./ + working-directory: Nominatim/test/php + + - uses: ./Nominatim/.github/actions/build-nominatim + with: + flavour: 'ubuntu-22' + + - name: Install test prerequisites + run: sudo apt-get install -y -qq python3-behave + + - name: BDD tests (php) + run: | + export PATH=$GITHUB_WORKSPACE/build/osm2pgsql:$PATH + python3 -m behave -DREMOVE_TEMPLATE=1 -DAPI_ENGINE=php --format=progress3 working-directory: Nominatim/test/bdd @@ -176,23 +230,16 @@ jobs: strategy: matrix: - name: [Ubuntu-18, Ubuntu-20, Ubuntu-22] + name: [Ubuntu-22, Ubuntu-24] 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 - flavour: ubuntu image: "ubuntu:22.04" ubuntu: 22 install_mode: install-apache + - name: Ubuntu-24 + image: "ubuntu:24.04" + ubuntu: 24 + install_mode: install-apache container: image: ${{ matrix.image }} @@ -212,14 +259,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: | @@ -231,7 +270,7 @@ jobs: OS: ${{ matrix.name }} INSTALL_MODE: ${{ matrix.install_mode }} - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v4 with: name: full-source path: /home/nominatim @@ -249,26 +288,35 @@ 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) + - name: Add nominatim to path 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' + sudo ln -s /home/nominatim/nominatim-venv/bin/nominatim /usr/local/bin/nominatim + if: matrix.ubuntu == 24 + + - name: Need lua binary + run: | + sudo apt-get install -y lua5.4 lua-dkjson + if: matrix.ubuntu == 24 - 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 @@ -288,11 +336,19 @@ jobs: - name: Prepare update (Ubuntu) run: apt-get install -y python3-pip shell: bash - if: matrix.flavour == 'ubuntu' - - name: Run update + - name: Install osmium (Ubuntu 22) run: | pip3 install --user osmium + if: matrix.ubuntu == 22 + + - name: Install osmium (Ubuntu 24) + run: | + /home/nominatim/nominatim-venv/bin/pip install osmium + if: matrix.ubuntu == 24 + + - name: Run update + run: | nominatim replication --init NOMINATIM_REPLICATION_MAX_DIFF=1 nominatim replication --once working-directory: /home/nominatim/nominatim-project @@ -314,3 +370,54 @@ 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 + + steps: + - uses: actions/download-artifact@v4 + with: + name: full-source + + - name: Unpack Nominatim + run: tar xf nominatim-src.tar.bz2 + + - uses: ./Nominatim/.github/actions/setup-postgresql + with: + postgresql-version: 16 + postgis-version: 3 + + - uses: ./Nominatim/.github/actions/build-nominatim + with: + flavour: ubuntu-22 + lua: 5.3 + + - name: Prepare import environment + run: | + mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf + rm -rf Nominatim + + - name: Prepare Database + run: | + nominatim import --prepare-database + + - name: Create import user + run: | + sudo -u postgres createuser osm-import + psql -d nominatim -c "ALTER USER \"osm-import\" WITH PASSWORD 'osm-import'" + psql -d nominatim -c 'GRANT CREATE ON SCHEMA public TO "osm-import"' + + - 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 + + - name: Check full import + run: nominatim admin --check-database + + codespell: + runs-on: ubuntu-latest + steps: + - uses: codespell-project/actions-codespell@v2 + with: + only_warn: 1