Skip to content

Commit 1ad5c3d

Browse files
committed
ci: use DC_SHA1=YesPlease on osx-clang job for CI
7b8cfe3 (Merge branch 'ed/fsmonitor-on-networked-macos', 2022-10-17) broke the build on macOS with sha1dc by bypassing our hash abstraction (git_SHA_CTX etc.), but it wasn't caught before the problematic topic was merged down to the 'master' branch. Nobody was even compile testing with DC_SHA1 set, although it is the recommended choice in these days for folks when they use SHA-1. This was because the default for macOS uses Apple Common Crypto, and both of the two CI jobs did not override the default. Tweak one of them to use DC_SHA1 to improve the coverage. We may want to give similar diversity for Linux jobs so that some of them build with other implementations of SHA-1; they currently all build and test with DC_SHA1 as that is the default on everywhere other than macOS. But let's start small to fill only the immediate need. Signed-off-by: Junio C Hamano <[email protected]>
1 parent d5b4139 commit 1ad5c3d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

ci/lib.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,8 @@ macos-latest)
259259
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
260260
else
261261
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
262+
MAKEFLAGS="$MAKEFLAGS NO_APPLE_COMMON_CRYPTO=NoThanks"
263+
MAKEFLAGS="$MAKEFLAGS DC_SHA1=YesPlease NO_OPENSSL=NoThanks"
262264
fi
263265
;;
264266
esac

0 commit comments

Comments
 (0)