Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ on: [ push, pull_request ]

jobs:

ubuntu22-pg11-gcc10-jit:
ubuntu22-pg12-gcc10-jit:
runs-on: ubuntu-22.04

env:
CC: gcc-10
CXX: g++-10
LUA_VERSION: 5.3
LUAJIT_OPTION: ON
POSTGRESQL_VERSION: 11
POSTGRESQL_VERSION: 12
POSTGIS_VERSION: 3
BUILD_TYPE: Release
PSYCOPG: 2
Expand All @@ -23,15 +23,15 @@ jobs:
- uses: ./.github/actions/linux-cmake
- uses: ./.github/actions/build-and-test

ubuntu22-pg11-clang13-jit:
ubuntu22-pg12-clang13-jit:
runs-on: ubuntu-22.04

env:
CC: clang-13
CXX: clang++-13
LUA_VERSION: 5.3
LUAJIT_OPTION: ON
POSTGRESQL_VERSION: 11
POSTGRESQL_VERSION: 12
POSTGIS_VERSION: 3
BUILD_TYPE: Release
PSYCOPG: 2
Expand All @@ -42,15 +42,15 @@ jobs:
- uses: ./.github/actions/linux-cmake
- uses: ./.github/actions/build-and-test

ubuntu22-pg11-gcc10:
ubuntu22-pg12-gcc10:
runs-on: ubuntu-22.04

env:
CC: gcc-10
CXX: g++-10
LUA_VERSION: 5.3
LUAJIT_OPTION: OFF
POSTGRESQL_VERSION: 11
POSTGRESQL_VERSION: 12
POSTGIS_VERSION: 3
BUILD_TYPE: Debug
PSYCOPG: 2
Expand All @@ -62,15 +62,15 @@ jobs:
- uses: ./.github/actions/build-and-test


ubuntu22-pg11-clang13:
ubuntu22-pg12-clang13:
runs-on: ubuntu-22.04

env:
CC: clang-13
CXX: clang++-13
LUA_VERSION: 5.3
LUAJIT_OPTION: OFF
POSTGRESQL_VERSION: 11
POSTGRESQL_VERSION: 12
POSTGIS_VERSION: 3
BUILD_TYPE: Debug
PSYCOPG: 2
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ if (NOT WIN32 AND NOT APPLE)
set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include)
endif()

set(MINIMUM_POSTGRESQL_SERVER_VERSION "11")
set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "110000")
set(MINIMUM_POSTGRESQL_SERVER_VERSION "12")
set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "120000")

set(PostgreSQL_ADDITIONAL_VERSIONS "19" "18" "17" "16" "15" "14" "13" "12" "11")
set(PostgreSQL_ADDITIONAL_VERSIONS "19" "18" "17" "16" "15" "14" "13" "12")

#############################################################
# Version
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ option to `ON`) but make sure you are using a compatible version:
* [protozero](https://github.com/mapbox/protozero) (>= 1.6.3)

It also requires access to a database server running
[PostgreSQL](https://www.postgresql.org/) (version 11+ works, 13+ strongly
[PostgreSQL](https://www.postgresql.org/) (version 12+ works, 14+ strongly
recommended) and [PostGIS](https://www.postgis.net/) (version 3.0+).

Make sure you have installed the development packages for the libraries
Expand Down
Loading