From 41cead8a0bb2fdccc93a04973ef6859dad93c150 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Thu, 5 Feb 2026 15:50:58 +0100 Subject: [PATCH 1/2] sync-upstream: Extend git usage tips --- contrib/sync-upstream.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh index 26a842c0..c1ad8e0a 100755 --- a/contrib/sync-upstream.sh +++ b/contrib/sync-upstream.sh @@ -116,7 +116,17 @@ do done # Remove trailing "," TITLE=${TITLE%?} -BODY=$(printf "%s\n\n%s\n%s" "$BODY" "This PR can be recreated with \`$REPRODUCE_COMMAND\`." "Tip: Use \`git show --remerge-diff\` to show the changes manually added to the merge commit.") +BODY+=$(cat <\` to show the conflict resolution in the merge commit. + * Use \`git read-tree --reset -u \` to replay these resolutions during the conflict resolution stage when recreating the PR branch locally. + Be aware that this may discard your index as well as the uncommitted changes and untracked files in your worktree. +EOF +) echo "-----------------------------------" echo "$TITLE" From 040673bd44de8b98be3abf682e6e19ba6db33e8e Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:51:16 +0000 Subject: [PATCH 2/2] ci, docker: Fix LLVM repository signature failure The LLVM apt repository uses legacy SHA1 signatures which are now rejected by the stricter Sequoia PGP policy. This change extends the 'sha1.second_preimage_resistance' cutoff date to 9999-01-01 in the default Sequoia config. This effectively whitelists the legacy signature algorithm, preventing "OpenPGP signature verification failed" errors during `apt-get update`. See https://github.com/llvm/llvm-project/issues/153385. --- ci/linux-debian.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/linux-debian.Dockerfile b/ci/linux-debian.Dockerfile index 5ce715b4..aa50951b 100644 --- a/ci/linux-debian.Dockerfile +++ b/ci/linux-debian.Dockerfile @@ -66,6 +66,9 @@ RUN \ wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \ # Add repository for this Debian release . /etc/os-release && echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME} main" >> /etc/apt/sources.list && \ + # Temporarily work around Sequoia PGP policy deadline for legacy repositories. + # See https://github.com/llvm/llvm-project/issues/153385. + sed -i 's/\(sha1\.second_preimage_resistance =\).*/\1 9999-01-01/' /usr/share/apt/default-sequoia.config && \ apt-get update && \ # Determine the version number of the LLVM development branch LLVM_VERSION=$(apt-cache search --names-only '^clang-[0-9]+$' | sort -V | tail -1 | cut -f1 -d" " | cut -f2 -d"-" ) && \