Commit90b2935

committed

[skip travis] fix rpm.sh

1 parent8151b9c commit90b2935Copy full SHA for 90b2935

File tree

-29

lines changed

-29

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,9 @@ include packaging/test/Makefile.debian`
`43`	`43`	`include packaging/test/Makefile.ubuntu`
`44`	`44`
`45`	`45`	`# CENTOS`
`46`		`-build/test_centos: build/test_centos_6 build/test_centos_7 build/test_centos_8`
	`46`	`+build/test_centos: build/test_centos_7 build/test_centos_8`
`47`	`47`	`@echo Centos: done`
`48`	`48`
`49`		`-build/test_centos_6: build/test_centos_6_9.6 build/test_centos_6_10 build/test_centos_6_11 build/test_centos_6_12 build/test_centos_6_13`
`50`		`-@echo Centos 6: done`
`51`		`-`
`52`	`49`	`build/test_centos_7: build/test_centos_7_9.6 build/test_centos_7_10 build/test_centos_7_11 build/test_centos_7_12 build/test_centos_7_13`
`53`	`50`	`@echo Centos 7: done`
`54`	`51`

Lines changed: 0 additions & 21 deletions

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ if [ ${DISTRIB} == 'rhel' ] && [ ${PG_TOG} == '13' ]; then # no packages for PG1`
`19`	`19`	`exit 0`
`20`	`20`	`fi`
`21`	`21`
`22`		`-if [${DISTRIB}=='oraclelinux' ]&& [${DISTRIB_VERSION}=='6' ]&& [${PG_TOG}=='13' ];then# no packages for PG13 on PGDG`
`23`		`-exit 0`
`24`		`-fi`
	`22`	`+#if [ ${DISTRIB} == 'oraclelinux' ] && [ ${DISTRIB_VERSION} == '6' ] && [ ${PG_TOG} == '13' ]; then # no packages for PG13 on PGDG`
	`23`	`+# exit 0`
	`24`	`+#fi`
`25`	`25`
`26`	`26`	`if [${DISTRIB_VERSION}=='6' ];then`
`27`	`27`	`yum install -y https://nginx.org/packages/rhel/6/x86_64/RPMS/nginx-1.8.1-1.el6.ngx.x86_64.rpm`
`@@ -54,7 +54,7 @@ events {`
`54`	`54`	`http {`
`55`	`55`	`server {`
`56`	`56`	`listen 80 default;`
`57`		`- root /var/www;`
	`57`	`+ root /app/www;`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`EOF`

Comments

(0)