Fail the build when perforce, git-lfs, or JGit fail to install, and drop the warnings that used to fire on every platform regardless of whether it even attempted the install.
Changes in v4:
* Drops the && chaining between the wget/tar/chmod install steps for
perforce, git-lfs, and JGit, since under set -e a failing command inside
an && chain is exempt from aborting the script unless it's the last one
in the chain, so the chain was silently letting an earlier failure fall
through instead of stopping the build.
* Reworded the quarantine-removal commit to lead with the observation (the
call does nothing and can go) before the history, fixed a dangling "this"
reference, and added that the same holds on GitLab CI's macOS runners,
not just GitHub Actions.
Changes in v3:
* New prep commit drops the xattr -d com.apple.quarantine call for the
macOS perforce binaries, it's been a silent no-op since perforce's
install moved off Homebrew in 2022, confirmed wget downloads never carry
that attribute.
* Drops the explicit echo "error: ..." / exit 1 blocks for perforce,
git-lfs, and JGit, relying on set -e (already active via ci/lib.sh) to
abort on the first failed install, matching how every other install step
in this file already works.
Changes in v2:
* Perforce, git-lfs, and JGit install failures now fail the build instead
of being silently swallowed. Removed the presence checks and warnings at
the end of the script, dead code once install failure is fatal.
* Version output (p4d -V, git-lfs version, jgit version) moved inline right
after each successful install.
Harald Nordgren (2):
ci: drop quarantine removal for macos perforce binaries
ci: fail the build if perforce, git-lfs, or JGit fail to install
ci/install-dependencies.sh | 64 +++++++++++++-------------------------
1 file changed, 22 insertions(+), 42 deletions(-)
base-commit: 7e34d8174dcda3435d1404c9a30bef46afe6c13e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2403%2FHaraldNordgren%2Fci-scope-optional-tool-warnings-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2403/HaraldNordgren/ci-scope-optional-tool-warnings-v4
Pull-Request: https://github.com/git/git/pull/2403
Range-diff vs v3:
1: e85ce85d92 ! 1: c1ee3fcb7d ci: drop quarantine removal for macos perforce binaries
@@ Metadata
## Commit message ##
ci: drop quarantine removal for macos perforce binaries
- A file downloaded with wget never gets com.apple.quarantine set,
- only Safari, Finder, and AirDrop apply that attribute through the
- LaunchServices quarantine API.
+ The xattr -d call that strips com.apple.quarantine from the macOS
+ perforce binaries has been doing nothing for years, and can simply
+ go.
5ed9fc3fc8 (ci: prevent `perforce` from being quarantined,
- 2020-02-27) added this to stop p4d -V from hanging on a GUI
+ 2020-02-27) added that call to stop p4d -V from hanging on a GUI
confirmation dialog that never comes on a CI box, back when perforce
was installed via Homebrew's --no-quarantine cask flag. When
49af448197 (ci: reintroduce prevention from perforce being
- quarantined in macOS, 2022-05-12) replaced that with a plain wget and
- tar download, it kept an xattr -d call as a precaution while noting
- that call already does nothing on GitHub Actions. It has been a
- silent no-op ever since.
+ quarantined in macOS, 2022-05-12) replaced that with a plain wget
+ and tar download, it kept the xattr -d call as a precaution, while
+ noting that it already does nothing on GitHub Actions.
+
+ A file downloaded with wget never gets com.apple.quarantine set in
+ the first place, only Safari, Finder, and AirDrop apply that
+ attribute through the LaunchServices quarantine API. The same holds
+ on GitLab CI's macOS runners, so the call has been a silent no-op
+ everywhere since 2022.
Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
2: a57cfbb2a5 ! 2: c6dda879aa ci: fail the build if perforce, git-lfs, or JGit fail to install
@@ Commit message
## ci/install-dependencies.sh ##
@@ ci/install-dependencies.sh: ubuntu-*|i386/ubuntu-*|debian-*)
+
wget --quiet --directory-prefix="$CUSTOM_PATH" \
"$P4WHENCE/bin.linux26x86_64/p4d" \
- "$P4WHENCE/bin.linux26x86_64/p4" &&
+- "$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
@@ ci/install-dependencies.sh: ubuntu-*|i386/ubuntu-*|debian-*)
+ 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" &&
++ "$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" &&
+- "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"
+-
+- wget --quiet "$JGITWHENCE" --output-document="$CUSTOM_PATH/jgit" &&
+- chmod a+x "$CUSTOM_PATH/jgit" ||
+- rm -f "$CUSTOM_PATH/jgit"
++ "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
@@ ci/install-dependencies.sh: ubuntu-*|i386/ubuntu-*|debian-*)
esac
;;
@@ ci/install-dependencies.sh: macos-*)
- wget -q "$P4WHENCE/bin.macosx12arm64/helix-core-server.tgz" &&
- tar -xf helix-core-server.tgz -C "$CUSTOM_PATH" p4 p4d &&
+ 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