Skip to content

Commit

Permalink
enable CI tests for Ubuntu 24
Browse files Browse the repository at this point in the history
  • Loading branch information
lonvia committed Jun 28, 2024
1 parent 4da4cbf commit fa1c402
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 8 deletions.
35 changes: 27 additions & 8 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ jobs:

- name: Install latest pylint
run: pip3 install -U pylint
if: matrix.flavour != 'oldstuff'
if: matrix.flavour == 'ubuntu-22'

- name: Python linting
run: python3 -m pylint src
working-directory: Nominatim
if: matrix.flavour != 'oldstuff'
if: matrix.flavour == 'ubuntu-22'

- name: Python unit tests
run: python3 -m pytest test/python
Expand Down Expand Up @@ -227,16 +227,16 @@ jobs:

strategy:
matrix:
name: [Ubuntu-20, Ubuntu-22]
name: [Ubuntu-22, Ubuntu-24]
include:
- name: Ubuntu-20
image: "ubuntu:20.04"
ubuntu: 20
install_mode: install-apache
- name: Ubuntu-22
image: "ubuntu:22.04"
ubuntu: 22
install_mode: install-apache
- name: Ubuntu-24
image: "ubuntu:24.04"
ubuntu: 24
install_mode: install-apache

container:
image: ${{ matrix.image }}
Expand Down Expand Up @@ -292,6 +292,16 @@ jobs:
mkdir data-env-reverse
working-directory: /home/nominatim

- name: Add nominatim to path
run: |
sudo ln -s /home/nominatim/nominatim-venv/bin/nominatim /usr/local/bin/nominatim
if: matrix.ubuntu == 24

- name: Need lua binary
run: |
sudo apt-get install -y lua5.4 lua-dkjson
if: matrix.ubuntu == 24

- name: Print version
run: nominatim --version
working-directory: /home/nominatim/nominatim-project
Expand Down Expand Up @@ -324,9 +334,18 @@ jobs:
run: apt-get install -y python3-pip
shell: bash

- name: Run update
- name: Install osmium (Ubuntu 22)
run: |
pip3 install --user osmium
if: matrix.ubuntu == 22

- name: Install osmium (Ubuntu 24)
run: |
/home/nominatim/nominatim-venv/bin/pip install osmium
if: matrix.ubuntu == 24

- name: Run update
run: |
nominatim replication --init
NOMINATIM_REPLICATION_MAX_DIFF=1 nominatim replication --once
working-directory: /home/nominatim/nominatim-project
Expand Down
Empty file modified vagrant/Install-on-Ubuntu-24.sh
100644 → 100755
Empty file.

0 comments on commit fa1c402

Please sign in to comment.