From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: [PATCH 1/2] ci: update the message for unavailble third-party software
Date: Fri, 25 Apr 2025 08:38:26 -0700 [thread overview]
Message-ID: <20250425153827.147585-2-gitster@pobox.com> (raw)
In-Reply-To: <20250425153827.147585-1-gitster@pobox.com>
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>
---
ci/install-dependencies.sh | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index e51304c3b0..be20271d3c 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -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"
--
2.49.0-564-g9a5a794ec8
next prev parent reply other threads:[~2025-04-25 15:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-24 22:13 repo.eclipse.org outage breaking all our linux CI jobs Junio C Hamano
2025-04-24 23:10 ` [PATCH] ci: skip unavailable external software Junio C Hamano
2025-04-25 4:19 ` Patrick Steinhardt
2025-04-25 9:49 ` Junio C Hamano
2025-04-25 10:02 ` Patrick Steinhardt
2025-04-25 14:39 ` Junio C Hamano
2025-04-25 12:01 ` Johannes Schindelin
2025-04-25 14:41 ` Junio C Hamano
2025-04-25 15:38 ` [PATCH 0/2] ci: update unavailable external software handling Junio C Hamano
2025-04-25 15:38 ` Junio C Hamano [this message]
2025-04-25 15:38 ` [PATCH 2/2] ci: download JGit from maven, not eclipse.org Junio C Hamano
2025-04-25 14:57 ` repo.eclipse.org outage breaking all our linux CI jobs shejialuo
2025-04-25 15:20 ` Junio C Hamano
2025-04-26 14:12 ` shejialuo
2025-04-28 6:49 ` Patrick Steinhardt
2025-04-28 10:30 ` shejialuo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250425153827.147585-2-gitster@pobox.com \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox