Updated CI runners

percona · Aug 5, 2024 · 9405aaa · 9405aaa
1 parent c42f9f4
commit 9405aaa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/postgresql-16-pgdg-package-pgxs.yml b/.github/workflows/postgresql-16-pgdg-package-pgxs.yml
@@ -56,7 +56,7 @@ jobs:
         run: |
           sudo -u postgres bash -c './configure'
           sudo -u postgres bash -c 'make USE_PGXS=1'
-          sudo make USE_PGXS=1 install
+          sudo make USE_PGXS=1 MAJORVERSION=16 install
         working-directory: src/pg_tde
 
       - name: Start pg_tde tests

diff --git a/.github/workflows/postgresql-16-src-make-macos.yml b/.github/workflows/postgresql-16-src-make-macos.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Build pg_tde
         run: |
           ./configure
-          make -j
+          make -j MAJORVERSION=16
           sudo make install
         working-directory: src/contrib/pg_tde
 

diff --git a/.github/workflows/postgresql-16-src-make-ssl11.yml b/.github/workflows/postgresql-16-src-make-ssl11.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Build pg_tde
         run: |
           ./configure
-          make -j
+          make -j MAJORVERSION=16
           sudo make install
         working-directory: src/contrib/pg_tde
 

diff --git a/.github/workflows/postgresql-16-src-make.yml b/.github/workflows/postgresql-16-src-make.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Build pg_tde
         run: |
           ./configure
-          make -j
+          make -j MAJORVERSION=16
           sudo make install
         working-directory: src/contrib/pg_tde
 

diff --git a/Makefile.in b/Makefile.in
@@ -57,12 +57,12 @@ override PG_CPPFLAGS += @tde_CPPFLAGS@
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
-override PG_CPPFLAGS += -I$(CURDIR)/src/include
+override PG_CPPFLAGS += -I$(CURDIR)/src/include -I$(CURDIR)/src$(MAJORVERSION)/include
 include $(PGXS)
 else
 subdir = contrib/pg_tde
 top_builddir = ../..
-override PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include
+override PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include -I$(top_srcdir)/$(subdir)/src$(MAJORVERSION)/include
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -14,7 +14,7 @@ WORKDIR /opt/pg_tde
 COPY . .
 
 RUN ./configure && \
-    make USE_PGXS=1 && \
+    make USE_PGXS=1 MAJORVERSION=16 && \
     make USE_PGXS=1 install
 RUN cp /usr/share/postgresql/postgresql.conf.sample /etc/postgresql/postgresql.conf; \
     echo "shared_preload_libraries = 'pg_tde'" >> /etc/postgresql/postgresql.conf; \