From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 4 Nov 2022 16:32:50 +0000 (+0100)
Subject: Merge pull request #2862 from mtmail/remove-version-from-fpm-sock-file
X-Git-Tag: v4.2.0~20
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/543d63e7a92e3f76bc4a12119c7c5507a5922aa6?hp=33c805aee0f8d3998ad68fcc3908dd85137a0ea9

Merge pull request #2862 from mtmail/remove-version-from-fpm-sock-file

Install scripts: remove version from /var/run/php-fpm filenames
---

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index a26ad000..7f9b82f4 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -50,7 +50,7 @@ jobs:
                       pytest: py.test-3
                       php: 7.4
                     - ubuntu: 22
-                      postgresql: 14
+                      postgresql: 15
                       postgis: 3
                       pytest: py.test-3
                       php: 8.1
diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index 9684a817..c8594298 100644
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -1,6 +1,6 @@
 # just use the pgxs makefile
 
-foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "14" "13" "12" "11" "10" "9.6")
+foreach(suffix ${PostgreSQL_ADDITIONAL_VERSIONS} "15" "14" "13" "12" "11" "10" "9.6")
     list(APPEND PG_CONFIG_HINTS
          "/usr/pgsql-${suffix}/bin")
 endforeach()