X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3969ce0f558d7df0afe14a80af5bfe0eaa0fcc99..173e85c9e632499790655f269f4274719874b3bf:/.github/workflows/ci-tests.yml diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 42c03edc..910114d7 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,40 +43,28 @@ 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 with: python-version: 3.7 @@ -119,20 +107,11 @@ jobs: 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: python3 -m pylint nominatim working-directory: Nominatim if: matrix.flavour != 'oldstuff' - - name: PHP unit tests - run: phpunit ./ - working-directory: Nominatim/test/php - - name: Python unit tests run: python3 -m pytest test/python working-directory: Nominatim @@ -156,7 +135,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: full-source @@ -185,16 +164,16 @@ jobs: - name: BDD tests (legacy tokenizer) run: | - python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3 + python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=php -DTOKENIZER=legacy --format=progress3 working-directory: Nominatim/test/bdd - python-api-test: + php-test: needs: create-archive runs-on: ubuntu-22.04 steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: full-source @@ -206,6 +185,23 @@ jobs: 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' @@ -213,12 +209,9 @@ jobs: - 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) + - name: BDD tests (php) run: | - python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=starlette --format=progress3 + python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=php --format=progress3 working-directory: Nominatim/test/bdd @@ -268,7 +261,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 @@ -354,90 +347,42 @@ 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 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 + - 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 - - - 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 + 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 - working-directory: /home/nominatim/nominatim-project + 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 - working-directory: /home/nominatim/nominatim-project \ No newline at end of file