Skip to content

Commit 20854bc

Browse files
jiangxindscho
authored andcommitted
ci: remove the pipe after "p4 -V" to catch errors
When installing p4 as a dependency, we used to pipe output of "p4 -V" and "p4d -V" to validate the installation and output a condensed version information. But this would hide potential errors of p4 and would stop with an empty output. E.g.: p4d version 16.2 running on ubuntu 22.04 causes sigfaults, even before it produces any output. By removing the pipe after "p4 -V" and "p4d -V", we may get a verbose output, and stop immediately on errors because we have "set -e" in "ci/lib.sh". Since we won't look at these trace logs unless something fails, just including the raw output seems most sensible. Reviewed-by: Johannes Schindelin <[email protected]> Helped-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c03ffcf commit 20854bc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/install-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ esac
8181
if type p4d >/dev/null && type p4 >/dev/null
8282
then
8383
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
84-
p4d -V | grep Rev.
84+
p4d -V
8585
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
86-
p4 -V | grep Rev.
86+
p4 -V
8787
fi
8888
if type git-lfs >/dev/null
8989
then

0 commit comments

Comments
 (0)