aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:44 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-25 17:11:44 -0700
commitbda957de7cd86933aa898351c796fd4a7d18f983 (patch)
tree6019fce86f8bd753c53fb593603a24bb4bb02f20
parentMerge branch 'gc/bare-repo-discovery' (diff)
parentci: use DC_SHA1=YesPlease on osx-clang job for CI (diff)
downloadgit-bda957de7cd86933aa898351c796fd4a7d18f983.tar.gz
git-bda957de7cd86933aa898351c796fd4a7d18f983.zip
Merge branch 'jc/ci-osx-with-sha1dc'
Give a bit more diversity to macOS CI by using sha1dc in one of the jobs (the other one tests Apple Common Crypto). * jc/ci-osx-with-sha1dc: ci: use DC_SHA1=YesPlease on osx-clang job for CI
-rwxr-xr-xci/lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/lib.sh b/ci/lib.sh
index 1b0cc2b57d..51e47aa5d6 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -259,6 +259,8 @@ macos-latest)
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python3)"
else
MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
+ MAKEFLAGS="$MAKEFLAGS NO_APPLE_COMMON_CRYPTO=NoThanks"
+ MAKEFLAGS="$MAKEFLAGS DC_SHA1=YesPlease NO_OPENSSL=NoThanks"
fi
;;
esac