From: Sarah Hoffmann Date: Mon, 26 Apr 2021 09:21:44 +0000 (+0200) Subject: Merge pull request #2298 from lonvia/add-warming-to-ci X-Git-Tag: v4.0.0~98 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/a21a0864f174e0877d11511b5ff2acff24438f12?hp=6812f397afd883bd8fb9605bc86251b105cccc34 Merge pull request #2298 from lonvia/add-warming-to-ci Add warming to CI import tests and fix more Python 3.5 compatibility issues --- diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index c63bb36d..a4bb45e0 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -163,6 +163,10 @@ jobs: run: nominatim admin --check-database working-directory: data-env + - name: Warm up database + run: nominatim admin --warm + working-directory: data-env + - name: Run update run: | nominatim replication --init diff --git a/nominatim/tools/exec_utils.py b/nominatim/tools/exec_utils.py index ffe7f556..9888d96a 100644 --- a/nominatim/tools/exec_utils.py +++ b/nominatim/tools/exec_utils.py @@ -18,16 +18,16 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False): then throw a `CalledProcessError` on a non-zero exit. """ cmd = ['/usr/bin/env', 'php', '-Cq', - nominatim_env.phplib_dir / 'admin' / script] + str(nominatim_env.phplib_dir / 'admin' / script)] cmd.extend([str(a) for a in args]) env = nominatim_env.config.get_os_env() env['NOMINATIM_DATADIR'] = str(nominatim_env.data_dir) env['NOMINATIM_SQLDIR'] = str(nominatim_env.sqllib_dir) env['NOMINATIM_CONFIGDIR'] = str(nominatim_env.config_dir) - env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = nominatim_env.module_dir + env['NOMINATIM_DATABASE_MODULE_SRC_PATH'] = str(nominatim_env.module_dir) if not env['NOMINATIM_OSM2PGSQL_BINARY']: - env['NOMINATIM_OSM2PGSQL_BINARY'] = nominatim_env.osm2pgsql_path + env['NOMINATIM_OSM2PGSQL_BINARY'] = str(nominatim_env.osm2pgsql_path) proc = subprocess.run(cmd, cwd=str(nominatim_env.project_dir), env=env, check=throw_on_fail)