mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-01 18:49:15 +01:00
Merge bitcoin/bitcoin#34633: Revert "ci: Treat SHA1 LLVM signing key as warning"
3574905cecRevert "ci: Treat SHA1 LLVM signing key as warning" (will) Pull request description: `git revert 3c8f5e48f710313de78bcbfafd09fed71890d754` This is now fixed [upstream](https://github.com/llvm/llvm-project/issues/153385). ACKs for top commit: hebasto: ACK3574905cec. Tree-SHA512: 0ac848095cb505aa42dbc498422ab9772c0e2a7fc6848a351be001a8234ea691885b81f9b4596a6a0fe014f54761ef2a585f671f6ed26086b6ea50b963c0ddf2
This commit is contained in:
@@ -22,11 +22,6 @@ if [ -n "$DPKG_ADD_ARCH" ]; then
|
||||
fi
|
||||
|
||||
if [ -n "${APT_LLVM_V}" ]; then
|
||||
# Temporarily work around Sequoia PGP policy deadline for legacy repositories.
|
||||
# See https://github.com/llvm/llvm-project/issues/153385.
|
||||
if [ -f /usr/share/apt/default-sequoia.config ]; then
|
||||
sed -i 's/\(sha1\.second_preimage_resistance =\).*/\1 9999-01-01/' /usr/share/apt/default-sequoia.config
|
||||
fi
|
||||
${CI_RETRY_EXE} apt-get update
|
||||
${CI_RETRY_EXE} apt-get install curl -y
|
||||
curl "https://apt.llvm.org/llvm-snapshot.gpg.key" | tee "/etc/apt/trusted.gpg.d/apt.llvm.org.asc"
|
||||
|
||||
Reference in New Issue
Block a user