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 a26ad0001a357ee99b1c5cdacca37c5e7db6643c..7f9b82f437e97f43fc77d059c03d88adb76b0db4 100644 (file)
--- 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 9684a8172ef0fdf7fc7de08564b99e3cb634a695..c85942982fd955b26962f423000accffe3d33958 100644 (file)
--- 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()