X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e51973f8b1eee034221eed6f91cddf2488020692..349710ff0108d1203ff182743a3a1ef283dd98d6:/.github/workflows/ci-tests.yml diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index c6ce2532..1b81f4f2 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -65,7 +65,7 @@ jobs: - name: Unpack Nominatim run: tar xf nominatim-src.tar.bz2 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.7 if: matrix.flavour == 'oldstuff' @@ -118,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 @@ -130,97 +131,6 @@ jobs: working-directory: Nominatim if: matrix.flavour != 'oldstuff' - legacy-test: - needs: create-archive - runs-on: ubuntu-20.04 - - strategy: - matrix: - postgresql: ["13", "16"] - - steps: - - 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: '7.4' - - - uses: ./Nominatim/.github/actions/setup-postgresql - with: - postgresql-version: ${{ matrix.postgresql }} - postgis-version: 3 - - - name: Install Postgresql server dev - run: sudo apt-get install postgresql-server-dev-$PGVER - env: - PGVER: ${{ matrix.postgresql }} - - - uses: ./Nominatim/.github/actions/build-nominatim - with: - cmake-args: -DBUILD_MODULE=on - - - name: Install test prerequisites - 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 -DAPI_ENGINE=php -DTOKENIZER=legacy --format=progress3 - working-directory: Nominatim/test/bdd - - - php-test: - needs: create-archive - runs-on: ubuntu-22.04 - - 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: 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' - - - name: Install test prerequisites - run: sudo apt-get install -y -qq python3-behave - - - name: BDD tests (php) - run: | - python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=php --format=progress3 - working-directory: Nominatim/test/bdd - - install: runs-on: ubuntu-latest needs: create-archive @@ -412,6 +322,48 @@ jobs: - 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: 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: