From d8ded8bc089385c63de37a9f4ba471a4d78b30f7 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Wed, 28 Sep 2022 19:58:13 +0200 Subject: [PATCH] ci: Use git2.34 for lint task --- ci/lint/04_install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 25787ce41c7..2b57411c3fe 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -8,6 +8,13 @@ export LC_ALL=C ${CI_RETRY_EXE} apt-get update ${CI_RETRY_EXE} apt-get install -y clang-format-9 python3-pip curl git gawk jq +( + # Temporary workaround for https://github.com/bitcoin/bitcoin/pull/26130#issuecomment-1260499544 + # Can be removed once the underlying image is bumped to something that includes git2.34 or later + sed -i -e 's/bionic/jammy/g' /etc/apt/sources.list + ${CI_RETRY_EXE} apt-get update + ${CI_RETRY_EXE} apt-get install -y --reinstall git +) update-alternatives --install /usr/bin/clang-format clang-format "$(which clang-format-9 )" 100 update-alternatives --install /usr/bin/clang-format-diff clang-format-diff "$(which clang-format-diff-9)" 100