Skip to content

Commit f872d39

Browse files
lonvialonvia
authored
Merge pull request #2302 from lonvia/ci-update
Update Github Actions to newer Ubuntu versions
2 parents b0a8bc6 + d33cd9c commit f872d39

File tree

6 files changed

+92
-119
lines changed

6 files changed

+92
-119
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 72 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ on: [ push, pull_request ]
44

55
jobs:
66

7-
ubuntu20-pg96-gcc10-jit:
8-
runs-on: ubuntu-20.04
7+
ubuntu22-pg11-gcc10-jit:
8+
runs-on: ubuntu-22.04
99

1010
env:
1111
CC: gcc-10
1212
CXX: g++-10
13-
EXTRA_FLAGS: -Wno-unused-but-set-parameter # workaround for GCC bug
1413
LUA_VERSION: 5.3
1514
LUAJIT_OPTION: ON
16-
POSTGRESQL_VERSION: 9.6
17-
POSTGIS_VERSION: 2.5
15+
POSTGRESQL_VERSION: 11
16+
POSTGIS_VERSION: 3
1817
BUILD_TYPE: Release
1918
PSYCOPG: 2
2019

@@ -24,16 +23,16 @@ jobs:
2423
- uses: ./.github/actions/linux-cmake
2524
- uses: ./.github/actions/build-and-test
2625

27-
ubuntu20-pg96-clang10-jit:
28-
runs-on: ubuntu-20.04
26+
ubuntu22-pg11-clang13-jit:
27+
runs-on: ubuntu-22.04
2928

3029
env:
31-
CC: clang-10
32-
CXX: clang++-10
30+
CC: clang-13
31+
CXX: clang++-13
3332
LUA_VERSION: 5.3
3433
LUAJIT_OPTION: ON
35-
POSTGRESQL_VERSION: 9.6
36-
POSTGIS_VERSION: 2.5
34+
POSTGRESQL_VERSION: 11
35+
POSTGIS_VERSION: 3
3736
BUILD_TYPE: Release
3837
PSYCOPG: 2
3938

@@ -43,16 +42,15 @@ jobs:
4342
- uses: ./.github/actions/linux-cmake
4443
- uses: ./.github/actions/build-and-test
4544

46-
ubuntu20-pg10-gcc10:
47-
runs-on: ubuntu-20.04
45+
ubuntu22-pg11-gcc10:
46+
runs-on: ubuntu-22.04
4847

4948
env:
5049
CC: gcc-10
5150
CXX: g++-10
52-
EXTRA_FLAGS: -Wno-unused-but-set-parameter # workaround for GCC bug
5351
LUA_VERSION: 5.3
5452
LUAJIT_OPTION: OFF
55-
POSTGRESQL_VERSION: 10
53+
POSTGRESQL_VERSION: 11
5654
POSTGIS_VERSION: 3
5755
BUILD_TYPE: Debug
5856
PSYCOPG: 2
@@ -64,16 +62,16 @@ jobs:
6462
- uses: ./.github/actions/build-and-test
6563

6664

67-
ubuntu20-pg11-clang10:
68-
runs-on: ubuntu-20.04
65+
ubuntu22-pg11-clang13:
66+
runs-on: ubuntu-22.04
6967

7068
env:
71-
CC: clang-10
72-
CXX: clang++-10
69+
CC: clang-13
70+
CXX: clang++-13
7371
LUA_VERSION: 5.3
7472
LUAJIT_OPTION: OFF
7573
POSTGRESQL_VERSION: 11
76-
POSTGIS_VERSION: 2.5
74+
POSTGIS_VERSION: 3
7775
BUILD_TYPE: Debug
7876
PSYCOPG: 2
7977

@@ -83,16 +81,16 @@ jobs:
8381
- uses: ./.github/actions/linux-cmake
8482
- uses: ./.github/actions/build-and-test
8583

86-
ubuntu20-pg13-gcc10-jit:
87-
runs-on: ubuntu-20.04
84+
ubuntu22-pg13-gcc11-jit:
85+
runs-on: ubuntu-22.04
8886

8987
env:
90-
CC: gcc-10
91-
CXX: g++-10
88+
CC: gcc-11
89+
CXX: g++-11
9290
LUA_VERSION: 5.3
9391
LUAJIT_OPTION: ON
9492
POSTGRESQL_VERSION: 13
95-
POSTGIS_VERSION: 2.5
93+
POSTGIS_VERSION: 3
9694
BUILD_TYPE: Debug
9795
PSYCOPG: 2
9896

@@ -103,15 +101,15 @@ jobs:
103101
- uses: ./.github/actions/build-and-test
104102

105103

106-
ubuntu20-pg15-clang10-jit:
107-
runs-on: ubuntu-20.04
104+
ubuntu22-pg12-clang14-jit:
105+
runs-on: ubuntu-22.04
108106

109107
env:
110-
CC: clang-10
111-
CXX: clang++-10
108+
CC: clang-14
109+
CXX: clang++-14
112110
LUA_VERSION: 5.3
113111
LUAJIT_OPTION: ON
114-
POSTGRESQL_VERSION: 15
112+
POSTGRESQL_VERSION: 12
115113
POSTGIS_VERSION: 3
116114
BUILD_TYPE: Debug
117115
PSYCOPG: 2
@@ -122,15 +120,15 @@ jobs:
122120
- uses: ./.github/actions/linux-cmake
123121
- uses: ./.github/actions/build-and-test
124122

125-
ubuntu20-pg15-clang10-noproj:
126-
runs-on: ubuntu-20.04
123+
ubuntu22-pg12-clang15-noproj:
124+
runs-on: ubuntu-22.04
127125

128126
env:
129-
CC: clang-10
130-
CXX: clang++-10
127+
CC: clang-15
128+
CXX: clang++-15
131129
LUA_VERSION: 5.3
132130
LUAJIT_OPTION: OFF
133-
POSTGRESQL_VERSION: 15
131+
POSTGRESQL_VERSION: 12
134132
POSTGIS_VERSION: 3
135133
WITH_PROJ: OFF
136134
BUILD_TYPE: Debug
@@ -142,12 +140,12 @@ jobs:
142140
- uses: ./.github/actions/linux-cmake
143141
- uses: ./.github/actions/build-and-test
144142

145-
ubuntu20-pg16-clang10:
146-
runs-on: ubuntu-20.04
143+
ubuntu22-pg16-clang15:
144+
runs-on: ubuntu-22.04
147145

148146
env:
149-
CC: clang-10
150-
CXX: clang++-10
147+
CC: clang-15
148+
CXX: clang++-15
151149
LUA_VERSION: 5.3
152150
LUAJIT_OPTION: OFF
153151
POSTGRESQL_VERSION: 16
@@ -161,16 +159,17 @@ jobs:
161159
- uses: ./.github/actions/linux-cmake
162160
- uses: ./.github/actions/build-and-test
163161

164-
ubuntu20-pg13-gcc10-release:
165-
runs-on: ubuntu-20.04
162+
ubuntu22-pg13-gcc12-release:
163+
runs-on: ubuntu-22.04
166164

167165
env:
168-
CC: gcc-10
169-
CXX: g++-10
166+
CC: gcc-12
167+
CXX: g++-12
168+
EXTRA_FLAGS: -Wno-stringop-overread
170169
LUA_VERSION: 5.3
171170
LUAJIT_OPTION: ON
172171
POSTGRESQL_VERSION: 13
173-
POSTGIS_VERSION: 2.5
172+
POSTGIS_VERSION: 3
174173
BUILD_TYPE: Release
175174
PSYCOPG: 2
176175

@@ -180,15 +179,15 @@ jobs:
180179
- uses: ./.github/actions/linux-cmake
181180
- uses: ./.github/actions/build-and-test
182181

183-
ubuntu22-pg16-clang14-jit:
184-
runs-on: ubuntu-22.04
182+
ubuntu24-pg14-clang16-jit:
183+
runs-on: ubuntu-24.04
185184

186185
env:
187-
CC: clang-14
188-
CXX: clang++-14
186+
CC: clang-16
187+
CXX: clang++-16
189188
LUA_VERSION: 5.4
190189
LUAJIT_OPTION: ON
191-
POSTGRESQL_VERSION: 16
190+
POSTGRESQL_VERSION: 14
192191
POSTGIS_VERSION: 3
193192
BUILD_TYPE: Debug
194193
PSYCOPG: 2
@@ -199,15 +198,15 @@ jobs:
199198
- uses: ./.github/actions/linux-cmake
200199
- uses: ./.github/actions/build-and-test
201200

202-
ubuntu22-pg16-clang14-proj:
203-
runs-on: ubuntu-22.04
201+
ubuntu24-pg14-clang17-proj:
202+
runs-on: ubuntu-24.04
204203

205204
env:
206-
CC: clang-14
207-
CXX: clang++-14
205+
CC: clang-17
206+
CXX: clang++-17
208207
LUA_VERSION: 5.4
209208
LUAJIT_OPTION: OFF
210-
POSTGRESQL_VERSION: 16
209+
POSTGRESQL_VERSION: 14
211210
POSTGIS_VERSION: 3
212211
BUILD_TYPE: Debug
213212
PSYCOPG: 2
@@ -218,15 +217,15 @@ jobs:
218217
- uses: ./.github/actions/linux-cmake
219218
- uses: ./.github/actions/build-and-test
220219

221-
ubuntu22-pg16-clang14-noproj:
222-
runs-on: ubuntu-22.04
220+
ubuntu24-pg15-clang17-noproj:
221+
runs-on: ubuntu-24.04
223222

224223
env:
225-
CC: clang-14
226-
CXX: clang++-14
224+
CC: clang-17
225+
CXX: clang++-17
227226
LUA_VERSION: 5.3
228227
LUAJIT_OPTION: OFF
229-
POSTGRESQL_VERSION: 16
228+
POSTGRESQL_VERSION: 15
230229
POSTGIS_VERSION: 3
231230
WITH_PROJ: OFF
232231
BUILD_TYPE: Debug
@@ -238,12 +237,12 @@ jobs:
238237
- uses: ./.github/actions/linux-cmake
239238
- uses: ./.github/actions/build-and-test
240239

241-
ubuntu22-pg15-clang14:
242-
runs-on: ubuntu-22.04
240+
ubuntu24-pg15-clang18:
241+
runs-on: ubuntu-24.04
243242

244243
env:
245-
CC: clang-14
246-
CXX: clang++-14
244+
CC: clang-18
245+
CXX: clang++-18
247246
LUA_VERSION: 5.4
248247
LUAJIT_OPTION: OFF
249248
POSTGRESQL_VERSION: 15
@@ -257,8 +256,8 @@ jobs:
257256
- uses: ./.github/actions/linux-cmake
258257
- uses: ./.github/actions/build-and-test
259258

260-
ubuntu22-pg16-gcc12-release:
261-
runs-on: ubuntu-22.04
259+
ubuntu24-pg16-gcc12-release:
260+
runs-on: ubuntu-24.04
262261

263262
env:
264263
CC: gcc-12
@@ -277,15 +276,15 @@ jobs:
277276
- uses: ./.github/actions/linux-cmake
278277
- uses: ./.github/actions/build-and-test
279278

280-
ubuntu22-pg16-clang15-cpp20:
281-
runs-on: ubuntu-22.04
279+
ubuntu24-pg17-clang16-cpp20:
280+
runs-on: ubuntu-24.04
282281

283282
env:
284-
CC: clang-15
285-
CXX: clang++-15
283+
CC: clang-16
284+
CXX: clang++-16
286285
LUA_VERSION: 5.3
287286
LUAJIT_OPTION: OFF
288-
POSTGRESQL_VERSION: 16
287+
POSTGRESQL_VERSION: 17
289288
POSTGIS_VERSION: 3
290289
CPP_VERSION: 20
291290
BUILD_TYPE: Debug
@@ -297,15 +296,15 @@ jobs:
297296
- uses: ./.github/actions/linux-cmake
298297
- uses: ./.github/actions/build-and-test
299298

300-
ubuntu22-pg16-gcc12-cpp20:
301-
runs-on: ubuntu-22.04
299+
ubuntu24-pg17-gcc12-cpp20:
300+
runs-on: ubuntu-24.04
302301

303302
env:
304303
CC: gcc-12
305304
CXX: g++-12
306305
LUA_VERSION: 5.3
307306
LUAJIT_OPTION: OFF
308-
POSTGRESQL_VERSION: 16
307+
POSTGRESQL_VERSION: 17
309308
POSTGIS_VERSION: 3
310309
CPP_VERSION: 20
311310
BUILD_TYPE: Debug
@@ -317,26 +316,6 @@ jobs:
317316
- uses: ./.github/actions/linux-cmake
318317
- uses: ./.github/actions/build-and-test
319318

320-
ubuntu24-pg16-gcc14:
321-
runs-on: ubuntu-24.04
322-
323-
env:
324-
CC: gcc-14
325-
CXX: g++-14
326-
LUA_VERSION: 5.4
327-
LUAJIT_OPTION: OFF
328-
POSTGRESQL_VERSION: 16
329-
POSTGIS_VERSION: 3
330-
BUILD_TYPE: Debug
331-
PSYCOPG: 3
332-
PIP_OPTION: --break-system-packages
333-
334-
steps:
335-
- uses: actions/checkout@v4
336-
- uses: ./.github/actions/ubuntu-prerequisites
337-
- uses: ./.github/actions/linux-cmake
338-
- uses: ./.github/actions/build-and-test
339-
340319
windows:
341320
strategy:
342321
fail-fast: false

‎.github/workflows/test-install.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
44

55
jobs:
66
ubuntu-test-install:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-24.04
88

99
strategy:
1010
matrix:
@@ -19,7 +19,7 @@ jobs:
1919

2020
env:
2121
LUA_VERSION: 5.3
22-
POSTGRESQL_VERSION: 14
22+
POSTGRESQL_VERSION: 16
2323
POSTGIS_VERSION: 3
2424
BUILD_TYPE: Release
2525
CXXFLAGS: -pedantic -Wextra -Wno-stringop-overread -Werror

‎CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
cmake_minimum_required(VERSION 3.8.0)
2+
cmake_minimum_required(VERSION 3.10.0)
33

44
project(osm2pgsql VERSION 2.0.1 LANGUAGES CXX C)
55

@@ -64,10 +64,10 @@ if (NOT WIN32 AND NOT APPLE)
6464
set(PostgreSQL_TYPE_INCLUDE_DIR /usr/include)
6565
endif()
6666

67-
set(MINIMUM_POSTGRESQL_SERVER_VERSION "9.6")
68-
set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "90600")
67+
set(MINIMUM_POSTGRESQL_SERVER_VERSION "11")
68+
set(MINIMUM_POSTGRESQL_SERVER_VERSION_NUM "110000")
6969

70-
set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11" "10" "9.6")
70+
set(PostgreSQL_ADDITIONAL_VERSIONS "17" "16" "15" "14" "13" "12" "11")
7171

7272
#############################################################
7373
# Version

0 commit comments

Comments
 (0)