X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5bf55a69a5f9ede8b4e673732f1150a81ca2de86..7f0d969d71a09cac63a2a916554427627ca399bc:/.github/workflows/ci-tests.yml diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 1dade3bc..ac5ac181 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 @@ -155,8 +134,12 @@ jobs: needs: create-archive runs-on: ubuntu-20.04 + strategy: + matrix: + postgresql: ["13", "16"] + steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: full-source @@ -170,11 +153,13 @@ jobs: - 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: @@ -185,16 +170,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 +191,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 +215,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 +267,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 @@ -349,3 +348,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