Commit4c86b29

authored and

committed

doc/Makefile: Default to USE_PGXS and openjade, and build docs during tests

1 parent229b55a commit4c86b29Copy full SHA for 4c86b29

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,13 @@ stages:`
`5`	`5`	`stage:build`
`6`	`6`	`image:credativ/postgresql-build:${PGVERSION}`
`7`	`7`	`before_script:`
`8`		`- -apt-get -y install libhealpix-cxx-dev`
	`8`	`+ -apt-get -y install libhealpix-cxx-dev docbook-dsssl docbook-xml openjade`
`9`	`9`	`script:`
`10`	`10`	`-make PROFILE="-Werror"`
`11`	`11`	`-make install`
`12`	`12`	`-if ! pg_virtualenv make installcheck; then cat regression.diffs; exit 1; fi`
	`13`	`+ -make -C doc`
	`14`	`+ -make -C doc install`
`13`	`15`
`14`	`16`	`build:9.4:{ <<: *build, variables: { PGVERSION: '9.4' } }`
`15`	`17`	`build:9.5:{ <<: *build, variables: { PGVERSION: '9.5' } }`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ dist: bionic`
`16`	`16`	`before_install:`
`17`	`17`	`# extra apt.pg.o.sh options added in version 204, travis currently has 199 (2019-11-27)`
`18`	`18`	`-sudo apt-get -qq update`
`19`		`- -sudo apt-get -y install postgresql-common libhealpix-cxx-dev`
	`19`	`+ -sudo apt-get -y install postgresql-common libhealpix-cxx-dev docbook-dsssl docbook-xml openjade`
`20`	`20`
`21`	`21`	`install:`
`22`	`22`	`-sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -p -v $PG_SUPPORTED_VERSIONS -i`
`@@ -26,3 +26,5 @@ script:`
`26`	`26`	`-sudo make install`
`27`	`27`	`-pg_virtualenv make installcheck`
`28`	`28`	`-if test -s regression.diffs; then cat regression.diffs; fi`
	`29`	`+ -make -C doc`
	`30`	`+ -sudo make -C doc install`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`#----------------------------------------------------------------------------`
`6`	`6`
	`7`	`+USE_PGXS = 1`
`7`	`8`	`ifdefUSE_PGXS`
`8`	`9`	`PG_CONFIG = pg_config`
`9`	`10`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`@@ -23,7 +24,7 @@ COLLATEINDEX = $(DOCBOOKSTYLE)/bin/collateindex.pl`
`23`	`24`	`endif`
`24`	`25`
`25`	`26`	`ifndefJADE`
`26`		`-JADE =jade`
	`27`	`+JADE =openjade`
`27`	`28`	`endif`
`28`	`29`	`SGMLINCLUDE = -D$(srcdir)`
`29`	`30`

Comments

(0)