X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c170d323d93f2ea63ef1c9af8ea11dbc388cbfb2..23dabad0b0c8c1ffd9b4973bfc9e1d739e6128d7:/.github/workflows/ci-tests.yml?ds=inline diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index f326c3ca..cdc7ea1e 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@v3 with: submodules: true - - uses: actions/cache@v2 + - uses: actions/cache@v3 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@v3 with: name: full-source path: nominatim-src.tar.bz2 @@ -37,10 +37,10 @@ jobs: needs: create-archive strategy: matrix: - ubuntu: [18, 20] + ubuntu: [18, 20, 22] include: - ubuntu: 18 - postgresql: 9.5 + postgresql: 9.6 postgis: 2.5 pytest: pytest php: 7.2 @@ -49,11 +49,16 @@ jobs: postgis: 3 pytest: py.test-3 php: 7.4 + - ubuntu: 22 + postgresql: 15 + postgis: 3 + pytest: py.test-3 + php: 8.1 runs-on: ubuntu-${{ matrix.ubuntu }}.04 steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: full-source @@ -64,10 +69,10 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - coverage: xdebug tools: phpunit, phpcs, composer + ini-values: opcache.jit=disable - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: 3.6 if: matrix.ubuntu == 18 @@ -82,12 +87,19 @@ jobs: ubuntu: ${{ matrix.ubuntu }} - name: Install test prerequsites - run: sudo apt-get install -y -qq pylint python3-pytest python3-behave python3-pytest-cov php-codecoverage + run: sudo apt-get install -y -qq python3-pytest python3-behave if: matrix.ubuntu == 20 - name: Install test prerequsites - run: pip3 install pylint==2.6.0 pytest pytest-cov behave==1.2.6 - if: matrix.ubuntu == 18 + run: pip3 install pylint pytest behave==1.2.6 + if: ${{ (matrix.ubuntu == 18) || (matrix.ubuntu == 22) }} + + - name: Install test prerequsites + run: sudo apt-get install -y -qq python3-pytest + if: matrix.ubuntu == 22 + + - name: Install latest pylint/mypy + run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests typing-extensions - name: PHP linting run: phpcs --report-width=120 . @@ -97,60 +109,34 @@ jobs: run: pylint nominatim working-directory: Nominatim + - name: Python static typechecking + run: mypy --strict nominatim + working-directory: Nominatim + + - name: PHP unit tests - run: phpunit --coverage-clover ../../coverage-php.xml ./ + run: phpunit ./ working-directory: Nominatim/test/php - if: matrix.ubuntu == 20 + if: ${{ (matrix.ubuntu == 20) || (matrix.ubuntu == 22) }} - name: Python unit tests - run: $PYTEST --cov=nominatim --cov-report=xml test/python + run: $PYTEST test/python working-directory: Nominatim env: PYTEST: ${{ matrix.pytest }} - - name: BDD tests - run: | - mkdir cov - behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 -DPHPCOV=./cov - composer require phpunit/phpcov:7.0.2 - vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov - working-directory: Nominatim/test/bdd - if: matrix.ubuntu == 20 - - name: BDD tests run: | behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 working-directory: Nominatim/test/bdd - if: matrix.ubuntu == 18 - - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 - with: - files: ./Nominatim/coverage*.xml - directory: ./ - name: codecov-umbrella - fail_ci_if_error: false - path_to_write_report: ./coverage/codecov_report.txt - verbose: true - if: matrix.ubuntu == 20 - icu-test: + legacy-test: needs: create-archive - strategy: - matrix: - ubuntu: [20] - include: - - ubuntu: 20 - postgresql: 13 - postgis: 3 - pytest: py.test-3 - php: 7.4 - - runs-on: ubuntu-${{ matrix.ubuntu }}.04 + runs-on: ubuntu-20.04 steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: full-source @@ -160,35 +146,27 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php }} - coverage: xdebug - tools: phpunit, phpcs, composer - - - uses: actions/setup-python@v2 - with: - python-version: 3.6 - if: matrix.ubuntu == 18 + php-version: 7.4 - uses: ./Nominatim/.github/actions/setup-postgresql with: - postgresql-version: ${{ matrix.postgresql }} - postgis-version: ${{ matrix.postgis }} + 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: ${{ matrix.ubuntu }} + ubuntu: 20 + cmake-args: -DBUILD_MODULE=on - name: Install test prerequsites run: sudo apt-get install -y -qq python3-behave - if: matrix.ubuntu == 20 - - - name: Install test prerequsites - run: pip3 install behave==1.2.6 - if: matrix.ubuntu == 18 - - name: BDD tests (icu tokenizer) + - name: BDD tests (legacy tokenizer) run: | - behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=icu --format=progress3 + behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3 working-directory: Nominatim/test/bdd @@ -198,7 +176,7 @@ jobs: strategy: matrix: - name: [Ubuntu-18, Ubuntu-20, Centos-8] + name: [Ubuntu-18, Ubuntu-20, Ubuntu-22] include: - name: Ubuntu-18 flavour: ubuntu @@ -210,9 +188,11 @@ jobs: image: "ubuntu:20.04" ubuntu: 20 install_mode: install-apache - - name: Centos-8 - flavour: centos - image: "centos:8" + - name: Ubuntu-22 + flavour: ubuntu + image: "ubuntu:22.04" + ubuntu: 22 + install_mode: install-apache container: image: ${{ matrix.image }} @@ -251,7 +231,7 @@ jobs: OS: ${{ matrix.name }} INSTALL_MODE: ${{ matrix.install_mode }} - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: full-source path: /home/nominatim @@ -281,6 +261,14 @@ jobs: working-directory: /home/nominatim if: matrix.flavour == 'centos' + - name: Print version + run: nominatim --version + working-directory: /home/nominatim/nominatim-project + + - 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