Commitc3124ed

committed

refactoring, add missing deps

1 parentaf6e719 commitc3124edCopy full SHA for c3124ed

File tree

+20

-16

lines changed

+20

-16

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ RUN apk add --no-cache \`
`6`	`6`	`perl perl-ipc-run \`
`7`	`7`	`make musl-dev gcc bison flex coreutils \`
`8`	`8`	`zlib-dev libedit-dev \`
`9`		`-clang-analyzer valgrind;`
	`9`	`+clang clang-analyzer valgrind;`
`10`	`10`
`11`	`11`	`# Environment`
`12`	`12`	`ENV LANG=C.UTF-8 PGDATA=/pg/data`

Lines changed: 19 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,21 +18,9 @@ status=0`
`18`	`18`	`pg_config`
`19`	`19`
`20`	`20`
`21`		`-# perform code checks if asked to`
`22`		`-if ["$LEVEL"="scan-build" ];then`
`23`		`-`
`24`		`-# perform static analyzis`
`25`		`-scan-build --status-bugs make USE_PGXS=1\|\| status=$?`
`26`		`-`
`27`		`-# something's wrong, exit now!`
`28`		`-if [$status-ne 0 ];thenexit 1;fi`
`29`		`-`
`30`		`-# don't forget to "make clean"`
`31`		`-make USE_PGXS=1 clean`
`32`		`-fi`
`33`		`-`
`34`		`-# build with cassert + valgrind support`
`35`		`-if ["$LEVEL"="hardcore" ]\|\| ["$LEVEL"="nightmare" ];then`
	`21`	`+# rebuild PostgreSQL with cassert + valgrind support`
	`22`	`+if ["$LEVEL"="hardcore" ]\|\| \`
	`23`	`+ ["$LEVEL"="nightmare" ];then`
`36`	`24`
`37`	`25`	`set -e`
`38`	`26`
`@@ -76,6 +64,22 @@ if [ "$LEVEL" = "hardcore" ] \|\| [ "$LEVEL" = "nightmare" ]; then`
`76`	`64`	`set +e`
`77`	`65`	`fi`
`78`	`66`
	`67`	`+# perform code checks if asked to`
	`68`	`+if ["$LEVEL"="scan-build" ]\|\| \`
	`69`	`+ ["$LEVEL"="hardcore" ]\|\| \`
	`70`	`+ ["$LEVEL"="nightmare" ];then`
	`71`	`+`
	`72`	`+# perform static analyzis`
	`73`	`+scan-build --status-bugs make USE_PGXS=1\|\| status=$?`
	`74`	`+`
	`75`	`+# something's wrong, exit now!`
	`76`	`+if [$status-ne 0 ];thenexit 1;fi`
	`77`	`+`
	`78`	`+# don't forget to "make clean"`
	`79`	`+make USE_PGXS=1 clean`
	`80`	`+fi`
	`81`	`+`
	`82`	`+`
`79`	`83`	`# build and install extension (using PG_CPPFLAGS and SHLIB_LINK for gcov)`
`80`	`84`	`make USE_PGXS=1 PG_CPPFLAGS="-coverage" SHLIB_LINK="-coverage"`
`81`	`85`	`make USE_PGXS=1 install`

Comments

(0)