Skip to content

Commit a910fda

Browse files
committed
Merge branch 'jc/ci-skip-unavailable-external-software' into maint-2.49
Make sure outage of third-party sites that supply P4, Git-LFS, and JGit we use for testing would not prevent our CI jobs from running at all. * jc/ci-skip-unavailable-external-software: ci: skip unavailable external software
2 parents 051923e + b0026da commit a910fda

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

ci/install-dependencies.sh

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,29 @@ ubuntu-*|i386/ubuntu-*|debian-*)
6666
mkdir --parents "$CUSTOM_PATH"
6767

6868
wget --quiet --directory-prefix="$CUSTOM_PATH" \
69-
"$P4WHENCE/bin.linux26x86_64/p4d" "$P4WHENCE/bin.linux26x86_64/p4"
70-
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4"
71-
72-
wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
69+
"$P4WHENCE/bin.linux26x86_64/p4d" \
70+
"$P4WHENCE/bin.linux26x86_64/p4" &&
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"
75+
}
76+
77+
wget --quiet \
78+
"$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" &&
7379
tar -xzf "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" \
74-
-C "$CUSTOM_PATH" --strip-components=1 "git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs"
75-
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
76-
77-
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit"
78-
chmod a+x "$CUSTOM_PATH/jgit"
80+
-C "$CUSTOM_PATH" --strip-components=1 \
81+
"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+
}
86+
87+
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+
}
7992
;;
8093
esac
8194
;;

0 commit comments

Comments
 (0)