global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: update the message for unavailble third-party software

Browse Source 
An earlier fix added an extra message immediately after failing to
download a third-party package.  But near the end of the script,
their availability is checked again and given a message.

Remove the new ones added with a recent fix, as they are redundant.
If we were to add more places to download these software (e.g. for
other platforms we currently do not download them on), the existing
warnning near the end of the script will also trigger.

While at it, as Dscho suggests, rewrite the WARNING: label on the
warning message to ::warning::, which presumably should be shown a
bit more prominently in the CI summary.

Suggested-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2025-04-25 08:38:26 -07:00
parent b0026daf1e
commit cbc1d8e265
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ci/install-dependencies.sh
View File

@@ -71,7 +71,6 @@ ubuntu-*|i386/ubuntu-*|debian-*)
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" || {
rm -f "$CUSTOM_PATH/p4"
rm -f "$CUSTOM_PATH/p4d"
echo >&2 "P4 download (optional) failed"
}
wget --quiet \
@@ -79,16 +78,12 @@ ubuntu-*|i386/ubuntu-*|debian-*)
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"
echo >&2 "LFS download (optional) failed"
}
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" ||
rm -f "$CUSTOM_PATH/git-lfs"
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" &&
chmod a+x "$CUSTOM_PATH/jgit" || {
rm -f "$CUSTOM_PATH/jgit"
echo >&2 "JGit download (optional) failed"
}
chmod a+x "$CUSTOM_PATH/jgit" ||
rm -f "$CUSTOM_PATH/jgit"
;;
esac
;;
@@ -151,7 +146,7 @@ then
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
p4 -V
else
echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
echo >&2 "::warning:: perforce wasn't installed, see above for clues why"
fi
if type git-lfs >/dev/null 2>&1
@@ -159,7 +154,7 @@ 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"
echo >&2 "::warning:: git-lfs wasn't installed, see above for clues why"
fi
if type jgit >/dev/null 2>&1
@@ -167,7 +162,7 @@ then
echo "$(tput setaf 6)JGit Version$(tput sgr0)"
jgit version
else
echo >&2 "WARNING: JGit wasn't installed, see above for clues why"
echo >&2 "::warning:: JGit wasn't installed, see above for clues why"
fi
end_group "Install dependencies"