Skip to content

Commit c5e4ec2

Browse files
ci: Remove OpenSSL 3.1 workaround for missing system CA
Commit 0b5d1fb fixed the SSL test to properly handle the error message from OpenSSL when the system CA pool is missing of invalid, so with that we can remove the workaround in Cirrus for when Homebrew clears the cert from OPENSSLDIR. Author: Jacob Champion <[email protected]> Discussion: https://postgr.es/m/CAAWbhmj3JtKuRcHcMuf1eCJmoZxMXdzLaYpEGmzu9+kgRGpu3A@mail.gmail.com
1 parent 69537f5 commit c5e4ec2

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

.cirrus.yml

+1-13
Original file line numberDiff line numberDiff line change
@@ -477,24 +477,12 @@ task:
477477
make \
478478
meson \
479479
openldap \
480-
openssl@3 \
480+
openssl \
481481
python \
482482
tcl-tk \
483483
zstd
484484
485485
brew cleanup -s # to reduce cache size
486-
487-
# brew cleanup removes the empty certs directory in OPENSSLDIR, causing
488-
# OpenSSL to report unexpected errors ("unregistered scheme") during
489-
# verification failures. Put it back for now as a workaround.
490-
#
491-
# https://github.com/orgs/Homebrew/discussions/4030
492-
#
493-
# Note that $(brew --prefix openssl) will give us the opt/ prefix but not
494-
# the etc/ prefix, so we hardcode the full path here. openssl@3 is pinned
495-
# above to try to minimize the chances of this changing beneath us, but it's
496-
# brittle...
497-
mkdir -p "/opt/homebrew/etc/openssl@3/certs"
498486
upload_caches: homebrew
499487

500488
ccache_cache:

0 commit comments

Comments
 (0)