Commit5df22d7

committed

Fix merge conflict from PGPROEE9_6

2 parentsf0093d1 +a14efc1 commit5df22d7Copy full SHA for 5df22d7

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,9 @@ test:ubuntu-16.04:`
`15`	`15`	`only:`
`16`	`16`	`-PGPROEE9_6`
`17`	`17`	`before_script:`
`18`		`- -apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjadelibzstd0libzstd-dev opensp docbook-xml docbook-xsldocbook`
	`18`	`+ -apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjade libzstd-dev opensp docbook docbook-xml docbook-xsllibxml2-utils xsltproc python-dev libicu-dev`
`19`	`19`	`script:`
`20`		`- -./configure --prefix=/opt/pgproee`
	`20`	`+ -./configure --prefix=/opt/pgproee --with-zstd --with-icu --with-python`
`21`	`21`	`-make -j $CORES world`
`22`		`- -sudo make install-world`
`23`		`- -make check`
`24`		`- -cd contrib`
`25`		`- -make check`
	`22`	`+ -make check-world`
`26`	`23`	`when:always`

Comments

(0)