ci: update the message for unavailble third-party software
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>
Junio C Hamano committed
Apr 25, 2025 at 08:38 UTC
cbc1d8e26547bcd2dac89328bff720efca6e1617
1 file changed
+7
-12
ci/install-dependencies.sh
+7
-12
@@ -71,7 +71,6 @@ ubuntu-*|i386/ubuntu-*|debian-*)
71
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" || {
72
rm -f "$CUSTOM_PATH/p4"
73
rm -f "$CUSTOM_PATH/p4d"
74
- echo >&2 "P4 download (optional) failed"
74
}
75
76
wget --quiet \
@@ -79,16 +78,12 @@ ubuntu-*|i386/ubuntu-*|debian-*)
78
tar -xzf "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" \
79
-C "$CUSTOM_PATH" --strip-components=1 \
80
"git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs" &&
82
- rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" || {
83
- rm -f "$CUSTOM_PATH/git-lfs"
84
- echo >&2 "LFS download (optional) failed"
85
- }
81
+ rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" ||
82
+ rm -f "$CUSTOM_PATH/git-lfs"
83
84
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" &&
88
- chmod a+x "$CUSTOM_PATH/jgit" || {
89
- rm -f "$CUSTOM_PATH/jgit"
90
- echo >&2 "JGit download (optional) failed"
91
- }
85
+ chmod a+x "$CUSTOM_PATH/jgit" ||
86
+ rm -f "$CUSTOM_PATH/jgit"
87
;;
88
esac
89
;;
@@ -151,7 +146,7 @@ then
146
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
147
p4 -V
148
else
154
- echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
149
+ echo >&2 "::warning:: perforce wasn't installed, see above for clues why"
150
fi
151
152
if type git-lfs >/dev/null 2>&1
@@ -159,7 +154,7 @@ then
154
echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)"
155
git-lfs version
156
else
162
- echo >&2 "WARNING: git-lfs wasn't installed, see above for clues why"
157
+ echo >&2 "::warning:: git-lfs wasn't installed, see above for clues why"
158
fi
159
160
if type jgit >/dev/null 2>&1
@@ -167,7 +162,7 @@ then
162
echo "$(tput setaf 6)JGit Version$(tput sgr0)"
163
jgit version
164
else
170
- echo >&2 "WARNING: JGit wasn't installed, see above for clues why"
165
+ echo >&2 "::warning:: JGit wasn't installed, see above for clues why"
166
fi
167
168
end_group "Install dependencies"