hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

actions: update to latest supported versions

Browse Source
This commit is contained in:
Sarah Hoffmann
2024-11-18 10:16:17 +01:00
parent 98c1b923fc
commit f1ba285319
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build-nominatim/action.yml vendored
View File

@@ -25,7 +25,7 @@ runs:
shell: bash shell: bash
- name: Install${{ matrix.flavour }} prerequisites - name: Install${{ matrix.flavour }} prerequisites
run: | run: |
sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua${LUA_VERSION} lua-dkjson nlohmann-json3-dev libspatialite7 libsqlite3-mod-spatialite sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua${LUA_VERSION} lua-dkjson nlohmann-json3-dev libspatialite-dev libsqlite3-mod-spatialite
if [ "$FLAVOUR" == "oldstuff" ]; then if [ "$FLAVOUR" == "oldstuff" ]; then
pip3 install MarkupSafe==2.0.1 python-dotenv jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4.31 psycopg==3.1.7 datrie asyncpg aiosqlite pip3 install MarkupSafe==2.0.1 python-dotenv jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4.31 psycopg==3.1.7 datrie asyncpg aiosqlite
else else

37
.github/workflows/ci-tests.yml vendored
View File

@@ -37,21 +37,16 @@ jobs:
needs: create-archive needs: create-archive
strategy: strategy:
matrix: matrix:
flavour: [oldstuff, "ubuntu-20", "ubuntu-22"] flavour: ["ubuntu-20", "ubuntu-24"]
include: include:
- flavour: oldstuff
ubuntu: 20
postgresql: '9.6'
postgis: '2.5'
lua: '5.1'
- flavour: ubuntu-20 - flavour: ubuntu-20
ubuntu: 20 ubuntu: 20
postgresql: 13 postgresql: 12
postgis: 3 postgis: 3
lua: '5.3' lua: '5.1'
- flavour: ubuntu-22 - flavour: ubuntu-24
ubuntu: 22 ubuntu: 24
postgresql: 15 postgresql: 17
postgis: 3 postgis: 3
lua: '5.3' lua: '5.3'
@@ -80,37 +75,25 @@ jobs:
flavour: ${{ matrix.flavour }} flavour: ${{ matrix.flavour }}
lua: ${{ matrix.lua }} lua: ${{ matrix.lua }}
- name: Install test prerequisites (behave from apt) - name: Install test prerequisites
run: sudo apt-get install -y -qq python3-behave
if: matrix.flavour == 'ubuntu-20'
- name: Install test prerequisites (behave from pip)
run: pip3 install behave==1.2.6 run: pip3 install behave==1.2.6
if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
- name: Install test prerequisites (from apt for Ununtu 2x) - name: Install test prerequisites
run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn
if: matrix.flavour != 'oldstuff'
- name: Install newer pytest-asyncio - name: Install newer pytest-asyncio
run: pip3 install -U pytest-asyncio run: pip3 install -U pytest-asyncio
if: matrix.flavour == 'ubuntu-20' if: matrix.flavour == 'ubuntu-20'
- name: Install test prerequisites (from pip for Ubuntu 18)
run: pip3 install pytest pytest-asyncio uvicorn
if: matrix.flavour == 'oldstuff'
- name: Install Python webservers - name: Install Python webservers
run: pip3 install falcon starlette asgi_lifespan run: pip3 install falcon starlette asgi_lifespan
- name: Install latest flake8 - name: Install latest flake8
run: pip3 install -U flake8 run: pip3 install -U flake8
if: matrix.flavour == 'ubuntu-22'
- name: Python linting - name: Python linting
run: python3 -m flake8 src run: python3 -m flake8 src
working-directory: Nominatim working-directory: Nominatim
if: matrix.flavour == 'ubuntu-22'
- name: Python unit tests - name: Python unit tests
run: python3 -m pytest test/python run: python3 -m pytest test/python
@@ -124,12 +107,10 @@ jobs:
- name: Install mypy and typechecking info - name: Install mypy and typechecking info
run: pip3 install -U mypy osmium uvicorn types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests types-ujson types-Pygments typing-extensions run: pip3 install -U mypy osmium uvicorn types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests types-ujson types-Pygments typing-extensions
if: matrix.flavour != 'oldstuff'
- name: Python static typechecking - name: Python static typechecking
run: python3 -m mypy --strict src run: python3 -m mypy --strict --python-version 3.8 src
working-directory: Nominatim working-directory: Nominatim
if: matrix.flavour != 'oldstuff'
install: install:
runs-on: ubuntu-latest runs-on: ubuntu-latest