dilim/git
1
0 Fork 0
mirror of https://github.com/git/git.git synced 2026-11-06 13:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hn/ci-fail-on-missing-deps' into next

Browse Source 
The CI scripts have been updated to fail the build immediately when
optional dependencies like Perforce, Git-LFS, or JGit fail to
install, instead of silently skipping their tests..

* hn/ci-fail-on-missing-deps:
  ci: fail the build if perforce, git-lfs, or JGit fail to install
  ci: drop quarantine removal for macos perforce binaries
This commit is contained in:
Junio C Hamano committed 2026-10-30 13:54:15 -07:00
2 parents 30c3f27cb8 266e43f1f7
commit 77e1329871
1 file changed
+21 -41
Download Patch File Download Diff File Expand all files Collapse all files
ci/install-dependencies.sh
+21 -41
View File
@@ -89,23 +89,26 @@ ubuntu-*|i386/debian-*|debian-*)
wget --quiet --directory-prefix="$CUSTOM_PATH" \
"$P4WHENCE/bin.linux26x86_64/p4d" \
"$P4WHENCE/bin.linux26x86_64/p4" &&
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" || {
rm -f "$CUSTOM_PATH/p4"
rm -f "$CUSTOM_PATH/p4d"
}
"$P4WHENCE/bin.linux26x86_64/p4"
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4"
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
p4d -V
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
p4 -V
wget --quiet \
"$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" &&
"$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
tar -xzf "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" \
-C "$CUSTOM_PATH" --strip-components=1 \
"git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs" &&
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" ||
rm -f "$CUSTOM_PATH/git-lfs"
"git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs"
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
git-lfs version
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" &&
chmod a+x "$CUSTOM_PATH/jgit" ||
rm -f "$CUSTOM_PATH/jgit"
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit"
chmod a+x "$CUSTOM_PATH/jgit"
echo "$(tput setaf 6)JGit Version$(tput sgr0)"
jgit version
;;
esac
;;
@@ -116,10 +119,13 @@ macos-*)
brew link --force gettext
mkdir -p "$CUSTOM_PATH"
wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" &&
tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
sudo xattr -d com.apple.quarantine "$CUSTOM_PATH/p4" "$CUSTOM_PATH/p4d" 2>/dev/null || true
wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz"
tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d
rm helix-core-server.tgz
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
p4d -V
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
p4 -V
case "$jobname" in
osx-meson)
@@ -167,30 +173,4 @@ Documentation)
;;
esac
if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
then
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
p4d -V
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
p4 -V
else
echo >&2 "::warning:: perforce wasn't installed, see above for clues why"
fi
if type git-lfs >/dev/null 2>&1
then
echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
git-lfs version
else
echo >&2 "::warning:: git-lfs wasn't installed, see above for clues why"
fi
if type jgit >/dev/null 2>&1
then
echo "$(tput setaf 6)JGit Version$(tput sgr0)"
jgit version
else
echo >&2 "::warning:: JGit wasn't installed, see above for clues why"
fi
end_group "Install dependencies"