Skip to content

Commit 6da89e0

Browse files
authored
Merge pull request #2191 from joto/ci-ubuntu-2404
Add CI build on Ubuntu 24.04
2 parents 8d7aa83 + 9f02b0f commit 6da89e0

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

.github/actions/ubuntu-prerequisites/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ runs:
3131
postgresql-client postgresql-contrib-${POSTGRESQL_VERSION} \
3232
python3-setuptools \
3333
zlib1g-dev
34-
pip3 install behave osmium
34+
pip3 install $PIP_OPTION behave osmium
3535
if [ "$CC" = clang-8 ]; then sudo apt-get install -yq --no-install-suggests --no-install-recommends clang-8; fi
3636
if [ "$PSYCOPG" = "2"]; then
3737
sudo apt-get install -yq --no-install-suggests --no-install-recommends python3-psycopg2
3838
else
39-
pip3 install psycopg
39+
pip3 install $PIP_OPTION psycopg
4040
fi
4141
shell: bash
4242

.github/workflows/ci.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,25 @@ jobs:
374374
- uses: ./.github/actions/ubuntu-prerequisites
375375
- uses: ./.github/actions/build-and-test
376376

377+
ubuntu24-pg16-gcc14:
378+
runs-on: ubuntu-24.04
379+
380+
env:
381+
CC: gcc-14
382+
CXX: g++-14
383+
LUA_VERSION: 5.4
384+
LUAJIT_OPTION: OFF
385+
POSTGRESQL_VERSION: 16
386+
POSTGIS_VERSION: 3
387+
BUILD_TYPE: Debug
388+
PSYCOPG: 3
389+
PIP_OPTION: --break-system-packages
390+
391+
steps:
392+
- uses: actions/checkout@v4
393+
- uses: ./.github/actions/ubuntu-prerequisites
394+
- uses: ./.github/actions/build-and-test
395+
377396
windows:
378397
strategy:
379398
fail-fast: false

0 commit comments

Comments
 (0)