Skip to content

Commit cf75a1c

Browse files
committed
ci: skip unavailable external software
The ci/install-dependencies.sh script used in a very early phase of our CI jobs downloads Perforce, Git-LFS, and JGit, used for running the test scripts. The test framework is prepared to properly skip the tests that depend on these external software, but the CI script is unnecessarily strict (due to its use of "set -e" in ci/lib.sh) and fails the entire CI run before even starting to test the rest of the system. Notice a failure to download to any of these external software, but keep going. Signed-off-by: Junio C Hamano <[email protected]>
1 parent 683c54c commit cf75a1c

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

ci/install-dependencies.sh

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,22 @@ 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"
69+
"$P4WHENCE/bin.linux26x86_64/p4d" \
70+
"$P4WHENCE/bin.linux26x86_64/p4" &&
71+
chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" ||
72+
echo >&2 "P4 download (optional) failed"
7173

72-
wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
74+
wget --quiet \
75+
"$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" &&
7376
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"
77+
-C "$CUSTOM_PATH" --strip-components=1 \
78+
"git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs" &&
79+
rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" ||
80+
echo >&2 "LFS download (optional) failed"
81+
82+
wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" &&
83+
chmod a+x "$CUSTOM_PATH/jgit" ||
84+
echo >&2 "JGit download (optional) failed"
7985
;;
8086
esac
8187
;;

0 commit comments

Comments
 (0)