X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/424c1f0d41bb949b18ebb942600a6f0a22b29af6..d77aa7dfc9541bffa0109da89b95f296e751aea0:/.github/workflows/ci-tests.yml diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index ff4594ed..fb664d99 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -11,7 +11,7 @@ jobs: with: submodules: true - - uses: actions/cache@v3 + - 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@v3 + uses: actions/upload-artifact@v4 with: name: full-source path: nominatim-src.tar.bz2 @@ -43,41 +43,29 @@ jobs: ubuntu: 20 postgresql: '9.6' postgis: '2.5' - php: '7.3' lua: '5.1' - flavour: ubuntu-20 ubuntu: 20 postgresql: 13 postgis: 3 - 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@v3 + - 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:9, phpcs, composer - ini-values: opcache.jit=disable - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.7 if: matrix.flavour == 'oldstuff' @@ -92,46 +80,37 @@ jobs: flavour: ${{ matrix.flavour }} lua: ${{ matrix.lua }} - - name: Install test prerequsites (behave from apt) + - 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 (behave from pip) + - name: Install test prerequisites (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) + - 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: Install newer pytest-asyncio - run: pip3 install -U pytest-asyncio==0.21.1 + run: pip3 install -U pytest-asyncio if: matrix.flavour == 'ubuntu-20' - - name: Install test prerequsites (from pip for Ubuntu 18) + - name: Install test prerequisites (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: Install latest flake8 + run: pip3 install -U flake8 + if: matrix.flavour == 'ubuntu-22' - name: Python linting - run: python3 -m pylint nominatim + run: python3 -m flake8 src working-directory: Nominatim - if: matrix.flavour != 'oldstuff' - - - name: PHP unit tests - run: phpunit ./ - working-directory: Nominatim/test/php + if: matrix.flavour == 'ubuntu-22' - name: Python unit tests run: python3 -m pytest test/python @@ -139,7 +118,8 @@ jobs: - name: BDD tests run: | - python3 -m 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 @@ -147,97 +127,26 @@ jobs: if: matrix.flavour != 'oldstuff' - name: Python static typechecking - run: python3 -m mypy --strict nominatim + run: python3 -m mypy --strict src working-directory: Nominatim if: matrix.flavour != 'oldstuff' - legacy-test: - needs: create-archive - runs-on: ubuntu-20.04 - - steps: - - uses: actions/download-artifact@v3 - 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: - cmake-args: -DBUILD_MODULE=on - - - 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: - 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 - - - uses: ./Nominatim/.github/actions/build-nominatim - with: - flavour: 'ubuntu-22' - - - name: Install test prerequsites - run: sudo apt-get install -y -qq python3-behave - - - name: Install Python webservers - run: pip3 install starlette asgi_lifespan httpx - - - name: BDD tests (starlette) - run: | - python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=starlette --format=progress3 - working-directory: Nominatim/test/bdd - - install: runs-on: ubuntu-latest needs: create-archive strategy: matrix: - name: [Ubuntu-20, Ubuntu-22] + name: [Ubuntu-22, Ubuntu-24] include: - - name: Ubuntu-20 - image: "ubuntu:20.04" - ubuntu: 20 - install_mode: install-apache - name: Ubuntu-22 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 }} @@ -268,7 +177,7 @@ jobs: OS: ${{ matrix.name }} INSTALL_MODE: ${{ matrix.install_mode }} - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: full-source path: /home/nominatim @@ -293,6 +202,16 @@ jobs: mkdir data-env-reverse working-directory: /home/nominatim + - name: Add nominatim to path + run: | + 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 @@ -325,9 +244,18 @@ jobs: run: apt-get install -y python3-pip shell: bash - - 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 @@ -354,97 +282,91 @@ jobs: 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 database users - run: | - useradd -m nominatim - useradd -m osm-import - echo 'nominatim ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/nominatim - 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 + - uses: actions/download-artifact@v4 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: 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 - 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 + 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 + + 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 + postgis-version: 3 + + - name: Install Python dependencies + run: | + sudo apt-get install --no-install-recommends virtualenv osm2pgsql - - name: Grant import user rights + - name: Install Nominatim master version run: | - sudo -u postgres psql -c "GRANT INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO \"osm-import\";" - working-directory: /home/nominatim/nominatim-project + virtualenv master + cd Nominatim + ../master/bin/pip install packaging/nominatim-db - - name: Change nominatim directory ownership + - name: Install Nominatim from pypi run: | - sudo chown -R osm-import /home/nominatim/nominatim-project + virtualenv release + ./release/bin/pip install nominatim-db - - name: Run import + - name: Import Nominatim database using release 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 - shell: sudo -Hu osm-import bash --noprofile --norc -eo pipefail {0} + ./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: Check full import - run: nominatim admin --check-database - working-directory: /home/nominatim/nominatim-project - shell: sudo -Hu osm-import bash --noprofile --norc -eo pipefail {0} \ No newline at end of file + - 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