Commit2c47f47

Maxim Orlov

committed

Revert "Revert "Merge branch 'master' into stable""

This reverts commit33a29a0.

1 parent8824b1d commit2c47f47Copy full SHA for 2c47f47

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-sudo:required`
`2`		`-`
`3`	`1`	`language:c`
`4`	`2`
`5`	`3`	`services:`
`@@ -18,13 +16,22 @@ notifications:`
`18`	`16`	`on_failure:always`
`19`	`17`
`20`	`18`	`env:`
`21`		`- -PG_VERSION=11 LEVEL=nightmare`
	`19`	`+ -PG_VERSION=13 LEVEL=nightmare`
	`20`	`+ -PG_VERSION=13 LEVEL=hardcore`
	`21`	`+ -PG_VERSION=13`
	`22`	`+# - PG_VERSION=12 LEVEL=nightmare`
	`23`	`+ -PG_VERSION=12 LEVEL=hardcore`
	`24`	`+ -PG_VERSION=12`
	`25`	`+# - PG_VERSION=11 LEVEL=nightmare`
`22`	`26`	`-PG_VERSION=11 LEVEL=hardcore`
`23`	`27`	`-PG_VERSION=11`
`24`	`28`	`-PG_VERSION=10`
`25`	`29`	`-PG_VERSION=9.6`
`26`	`30`	`-PG_VERSION=9.5`
`27`	`31`
	`32`	`+# XXX: consider fixing nightmare mode`
`28`	`33`	`matrix:`
`29`	`34`	`allow_failures:`
`30`	`35`	`-env:PG_VERSION=11 LEVEL=nightmare`
	`36`	`+ -env:PG_VERSION=12 LEVEL=nightmare`
	`37`	`+ -env:PG_VERSION=13 LEVEL=nightmare`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ RUN apk add --no-cache \`
`5`	`5`	`openssl curl \`
`6`	`6`	`perl perl-ipc-run \`
`7`	`7`	`make musl-dev gcc bison flex coreutils \`
`8`		`-zlib-dev libedit-dev \`
	`8`	`+zlib-dev libedit-devlinux-headers\`
`9`	`9`	`clang clang-analyzer;`
`10`	`10`
`11`	`11`	`# Install fresh valgrind`

Comments

(0)