ci: fail the build if perforce, git-lfs, or JGit fail to install A failed install of perforce, git-lfs, or JGit was silently tolerated. The corresponding tests would just skip and the build stayed green, so a broken download could go unnoticed indefinitely. Fail the build immediately instead on the platforms that install these tools. The presence checks and warnings at the end of the script are gone too, since we already know by then that everything installed or the build wouldn't have gotten this far. Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 203e840..d35c641 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh
@@ -93,23 +93,26 @@ wget --quiet --directory-prefix="$CUSTOM_PATH" \ "$P4WHENCE/bin.linux26x86_64/p4d" \ - "$P4WHENCE/bin.linux26x86_64/p4" && - chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" || { - rm -f "$CUSTOM_PATH/p4" - rm -f "$CUSTOM_PATH/p4d" - } + "$P4WHENCE/bin.linux26x86_64/p4" + chmod a+x "$CUSTOM_PATH/p4d" "$CUSTOM_PATH/p4" + echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" + p4d -V + echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" + p4 -V wget --quiet \ - "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" && + "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" 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" + "git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs" + rm "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz" + echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)" + git-lfs version - wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" && - chmod a+x "$CUSTOM_PATH/jgit" || - rm -f "$CUSTOM_PATH/jgit" + wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" + chmod a+x "$CUSTOM_PATH/jgit" + echo "$(tput setaf 6)JGit Version$(tput sgr0)" + jgit version ;; esac ;; @@ -120,9 +123,13 @@ brew link --force gettext mkdir -p "$CUSTOM_PATH" - wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" && - tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d && + wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" + tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d rm helix-core-server.tgz + echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" + p4d -V + echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" + p4 -V case "$jobname" in osx-meson) @@ -170,30 +177,4 @@ ;; esac -if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1 -then - echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)" - p4d -V - echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)" - p4 -V -else - echo >&2 "::warning:: perforce wasn't installed, see above for clues why" -fi - -if type git-lfs >/dev/null 2>&1 -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" -fi - -if type jgit >/dev/null 2>&1 -then - echo "$(tput setaf 6)JGit Version$(tput sgr0)" - jgit version -else - echo >&2 "::warning:: JGit wasn't installed, see above for clues why" -fi - end_group "Install dependencies"