Skip to content

Commit f9f4bc5

Browse files
authored
Merge pull request #1008 from c2main/update-makefile
Update Makefile * sort/organize the main Makefile * move on their own makefile citus and azure things * make sure .PHONY is defined when needed * add some new targets per pg version (following the same -pgXX suffix) * fix some missing targets and missing dependency (some might still need attention) * IMPORTANT: now use ".SECONDEXPANSION" to allow more generic target/prerequisites. * removed pg16 from GHA until main is fixed.
2 parents 7204e2a + ae5fa55 commit f9f4bc5

File tree

9 files changed

+312
-220
lines changed

9 files changed

+312
-220
lines changed

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- 13
2424
- 14
2525
- 15
26-
- 16
26+
# - 16 # FIXME pg16 should be supported but main still does not work with it.
2727
TEST:
2828
- multi
2929
- single

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ ENV PG_CONFIG /usr/lib/postgresql/${PGVERSION}/bin/pg_config
108108
WORKDIR /usr/src/pg_auto_failover
109109

110110
COPY Makefile ./
111+
COPY Makefile.azure ./
112+
COPY Makefile.citus ./
111113
COPY ./src/ ./src
112114
COPY ./src/bin/pg_autoctl/git-version.h ./src/bin/pg_autoctl/git-version.h
113115
RUN make -s clean && make -s install -j8

Dockerfile.docs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ RUN pip3 install sphinx_rtd_theme
2323
WORKDIR /usr/src/pg_auto_failover
2424

2525
COPY Makefile ./
26+
COPY Makefile.azure ./
27+
COPY Makefile.citus ./
2628
COPY ./src ./src
2729
COPY ./docs ./docs
2830

Dockerfile.i386

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
5656
WORKDIR /usr/src/pg_auto_failover
5757

5858
COPY Makefile ./
59+
COPY Makefile.azure ./
60+
COPY Makefile.citus ./
5961
COPY ./src/ ./src
6062
RUN make -s clean && make -s install
6163

0 commit comments

Comments
 (0)