NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit153836b

committed

ci: Remove installation of libcurl

The CI images come with libcurl pre-installed since commit a119426in the pg-vm-images repository so remove the installation commandsfrom the Cirrus tasks. Installation of libcurl packages was addedin the OAuth patchset which introduced the dependency, a backpatchis thus not applicable.Author: Daniel Gustafsson <daniel@yesql.se>Reviewed-by: Andres Freund <andres@anarazel.de>Discussion:https://postgr.es/m/8745B9D8-D897-4302-BD4C-FC18F291ECB7@yesql.se

1 parentd4a6c84 commit153836bCopy full SHA for 153836b

File tree

1 file changed

-7

lines changed

.cirrus.tasks.yml

1 file changed

-7

lines changed

`‎.cirrus.tasks.yml`

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ task:`
`188`	`188`	`chown root:postgres /tmp/cores`
`189`	`189`	`sysctl kern.corefile='/tmp/cores/%N.%P.core'`
`190`	`190`	`setup_additional_packages_script:\|`
`191`		`- pkg install -ycurl`
	`191`	`+#pkg install -y...`
`192`	`192`
`193`	`193`	`# NB: Intentionally build without -Dllvm. The freebsd image size is already`
`194`	`194`	`# large enough to make VM startup slow, and even without llvm freebsd`
`@@ -445,10 +445,8 @@ task:`
`445`	`445`	`EOF`
`446`	`446`
`447`	`447`	`setup_additional_packages_script:\|`
`448`		`- apt-get update`
`449`		`- DEBIAN_FRONTEND=noninteractive apt-get -y install \`
`450`		`- libcurl4-openssl-dev \`
`451`		`- libcurl4-openssl-dev:i386 \`
	`448`	`+ #apt-get update`
	`449`	`+ #DEBIAN_FRONTEND=noninteractive apt-get -y install ...`
`452`	`450`
`453`	`451`	`matrix:`
`454`	`452`	`# SPECIAL:`
`@@ -837,8 +835,8 @@ task:`
`837`	`835`	`folder:$CCACHE_DIR`
`838`	`836`
`839`	`837`	`setup_additional_packages_script:\|`
`840`		`- apt-get update`
`841`		`- DEBIAN_FRONTEND=noninteractive apt-get -y installlibcurl4-openssl-dev`
	`838`	`+#apt-get update`
	`839`	`+#DEBIAN_FRONTEND=noninteractive apt-get -y install...`
`842`	`840`
`843`	`841`	`###`
`844`	`842`	`# Test that code can be built with gcc/clang without warnings`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit153836b

File tree

1 file changed

1 file changed

`‎.cirrus.tasks.yml`

0 commit comments