Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 153836b

Browse files
ci: Remove installation of libcurl
The CI images come with libcurl pre-installed since commit a119426 in the pg-vm-images repository so remove the installation commands from the Cirrus tasks. Installation of libcurl packages was added in the OAuth patchset which introduced the dependency, a backpatch is 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 parent d4a6c84 commit 153836b

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

.cirrus.tasks.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ task:
188188
chown root:postgres /tmp/cores
189189
sysctl kern.corefile='/tmp/cores/%N.%P.core'
190190
setup_additional_packages_script: |
191-
pkg install -y curl
191+
#pkg install -y ...
192192
193193
# NB: Intentionally build without -Dllvm. The freebsd image size is already
194194
# large enough to make VM startup slow, and even without llvm freebsd
@@ -445,10 +445,8 @@ task:
445445
EOF
446446
447447
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 ...
452450
453451
matrix:
454452
# SPECIAL:
@@ -837,8 +835,8 @@ task:
837835
folder: $CCACHE_DIR
838836

839837
setup_additional_packages_script: |
840-
apt-get update
841-
DEBIAN_FRONTEND=noninteractive apt-get -y install libcurl4-openssl-dev
838+
#apt-get update
839+
#DEBIAN_FRONTEND=noninteractive apt-get -y install ...
842840
843841
###
844842
# Test that code can be built with gcc/clang without warnings

0 commit comments

Comments
 (0)