X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7a22ae6bf9b3180ce1fd3ed2be42f68c29bda683..4cce681ead77ff2e5bdee2e7f1695162c805bbb5:/.github/workflows/ci-tests.yml?ds=inline diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 7f9b82f4..8b38d3dc 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,162 +37,106 @@ jobs: needs: create-archive strategy: matrix: - ubuntu: [18, 20, 22] + flavour: ["ubuntu-20", "ubuntu-24"] include: - - ubuntu: 18 - postgresql: 9.6 - postgis: 2.5 - pytest: pytest - php: 7.2 - - ubuntu: 20 - postgresql: 13 - postgis: 3 - pytest: py.test-3 - php: 7.4 - - ubuntu: 22 - postgresql: 15 - postgis: 3 - pytest: py.test-3 - php: 8.1 + - flavour: ubuntu-20 + ubuntu: 20 + postgresql: 12 + lua: '5.1' + dependencies: pip + - flavour: ubuntu-24 + ubuntu: 24 + postgresql: 17 + lua: '5.3' + dependencies: apt 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 - 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 - - uses: ./Nominatim/.github/actions/setup-postgresql with: postgresql-version: ${{ matrix.postgresql }} - postgis-version: ${{ matrix.postgis }} - uses: ./Nominatim/.github/actions/build-nominatim with: - ubuntu: ${{ matrix.ubuntu }} + dependencies: ${{ matrix.dependencies }} - - name: Install test prerequsites - run: sudo apt-get install -y -qq python3-pytest python3-behave - if: matrix.ubuntu == 20 + - name: Compile osm2pgsql + run: | + sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua-dkjson nlohmann-json3-dev + mkdir osm2pgsql-build + cd osm2pgsql-build + git clone https://github.com/osm2pgsql-dev/osm2pgsql + mkdir build + cd build + cmake ../osm2pgsql + make + sudo make install + cd ../.. + rm -rf osm2pgsql-build + if: matrix.ubuntu == '20' + env: + LUA_VERSION: ${{ 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 + run: ./venv/bin/pip install behave==1.2.6 - - name: Install test prerequsites - run: sudo apt-get install -y -qq python3-pytest - if: matrix.ubuntu == 22 + - name: Install test prerequisites (apt) + run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn python3-falcon python3-aiosqlite python3-pyosmium + if: matrix.dependencies == 'apt' - - 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 (pip) + run: ./venv/bin/pip install pytest-asyncio falcon starlette asgi_lifespan aiosqlite osmium uvicorn + if: matrix.dependencies == 'pip' - - name: PHP linting - run: phpcs --report-width=120 . - working-directory: Nominatim + - name: Install latest flake8 + run: ./venv/bin/pip install -U flake8 - name: Python linting - run: pylint nominatim + run: ../venv/bin/python -m flake8 src working-directory: Nominatim + - name: Install mypy and typechecking info + run: ./venv/bin/pip install -U mypy types-PyYAML types-jinja2 types-psutil types-requests types-ujson types-Pygments typing-extensions + if: matrix.dependencies == 'pip' + - name: Python static typechecking - run: mypy --strict nominatim + run: ../venv/bin/python -m mypy --strict --python-version 3.8 src working-directory: Nominatim - - - - name: PHP unit tests - run: phpunit ./ - working-directory: Nominatim/test/php - if: ${{ (matrix.ubuntu == 20) || (matrix.ubuntu == 22) }} + if: matrix.dependencies == 'pip' - name: Python unit tests - run: $PYTEST test/python + run: ../venv/bin/python -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 + ../../../venv/bin/python -m behave -DREMOVE_TEMPLATE=1 --format=progress3 working-directory: Nominatim/test/bdd - - legacy-test: - needs: create-archive - runs-on: ubuntu-20.04 - - steps: - - uses: actions/download-artifact@v2 - with: - name: full-source - - - name: Unpack Nominatim - run: tar xf nominatim-src.tar.bz2 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - 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: - ubuntu: 20 - cmake-args: -DBUILD_MODULE=on - - - name: Install test prerequsites - 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 - working-directory: Nominatim/test/bdd - - install: runs-on: ubuntu-latest needs: create-archive 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 +156,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 +167,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 +185,33 @@ 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 + + - name: Need lua binary + run: | + sudo apt-get install -y lua5.4 lua-dkjson - 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 @@ -285,14 +228,12 @@ jobs: run: nominatim admin --warm working-directory: /home/nominatim/nominatim-project - - name: Prepare update (Ubuntu) - run: apt-get install -y python3-pip - shell: bash - if: matrix.flavour == 'ubuntu' + - name: Install osmium + run: | + /home/nominatim/nominatim-venv/bin/pip install osmium - name: Run update run: | - pip3 install --user osmium nominatim replication --init NOMINATIM_REPLICATION_MAX_DIFF=1 nominatim replication --once working-directory: /home/nominatim/nominatim-project @@ -314,3 +255,91 @@ 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-24.04 + 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 + + - uses: ./Nominatim/.github/actions/build-nominatim + + - name: Prepare import environment + run: | + mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf + rm -rf Nominatim + + - name: Prepare Database + run: | + ./venv/bin/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" ./venv/bin/nominatim import --continue import-from-file --osm-file test.pbf + + - name: Check full import + run: ./venv/bin/nominatim admin --check-database + + migrate: + runs-on: ubuntu-24.04 + 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: 17 + + - name: Install Python dependencies + run: | + sudo apt-get install --no-install-recommends virtualenv osm2pgsql + + - name: Install Nominatim master version + run: | + virtualenv master + cd Nominatim + ../master/bin/pip install packaging/nominatim-db + + - name: Install Nominatim from pypi + run: | + virtualenv release + ./release/bin/pip install nominatim-db + + - name: Import Nominatim database using release + run: | + ./release/bin/nominatim import --osm-file Nominatim/test/testdb/apidb-test-data.pbf + ./release/bin/nominatim add-data --file Nominatim/test/testdb/additional_api_test.data.osm + + - name: Migrate to master version + run: | + ./master/bin/nominatim admin --migrate + ./release/bin/nominatim add-data --file Nominatim/test/testdb/additional_api_test.data.osm + + codespell: + runs-on: ubuntu-latest + steps: + - uses: codespell-project/actions-codespell@v2 + with: + only_warn: 1