Skip to content

Commit

Permalink
Merge pull request #1008 from c2main/update-makefile
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
c2main authored Sep 27, 2023
2 parents 7204e2a + ae5fa55 commit f9f4bc5
Show file tree
Hide file tree
Showing 9 changed files with 312 additions and 220 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- 13
- 14
- 15
- 16
# - 16 # FIXME pg16 should be supported but main still does not work with it.
TEST:
- multi
- single
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ ENV PG_CONFIG /usr/lib/postgresql/${PGVERSION}/bin/pg_config
WORKDIR /usr/src/pg_auto_failover

COPY Makefile ./
COPY Makefile.azure ./
COPY Makefile.citus ./
COPY ./src/ ./src
COPY ./src/bin/pg_autoctl/git-version.h ./src/bin/pg_autoctl/git-version.h
RUN make -s clean && make -s install -j8
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.docs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ RUN pip3 install sphinx_rtd_theme
WORKDIR /usr/src/pg_auto_failover

COPY Makefile ./
COPY Makefile.azure ./
COPY Makefile.citus ./
COPY ./src ./src
COPY ./docs ./docs

Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.i386
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
WORKDIR /usr/src/pg_auto_failover

COPY Makefile ./
COPY Makefile.azure ./
COPY Makefile.citus ./
COPY ./src/ ./src
RUN make -s clean && make -s install

Expand Down
Loading

0 comments on commit f9f4bc5

Please sign in to comment.