diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-26 08:54:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-26 08:54:47 -0800 |
| commit | 93bc02f8f958085aaa41ccfa2b3cb400405b7b34 (patch) | |
| tree | 341045265cb73a11bf6341983f425f8e125fbd8a /ci/install-dependencies.sh | |
| parent | Merge branch 'ps/completion-with-reftable-fix' (diff) | |
| parent | ci: add macOS jobs to GitLab CI (diff) | |
| download | git-93bc02f8f958085aaa41ccfa2b3cb400405b7b34.tar.gz git-93bc02f8f958085aaa41ccfa2b3cb400405b7b34.zip | |
Merge branch 'ps/gitlab-ci-macos'
CI for GitLab learned to drive macOS jobs.
* ps/gitlab-ci-macos:
ci: add macOS jobs to GitLab CI
ci: make p4 setup on macOS more robust
ci: handle TEST_OUTPUT_DIRECTORY when printing test failures
Makefile: detect new Homebrew location for ARM-based Macs
t7527: decrease likelihood of racing with fsmonitor daemon
Diffstat (limited to 'ci/install-dependencies.sh')
| -rwxr-xr-x | ci/install-dependencies.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 4f407530d3..b4e22de3cb 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -37,15 +37,13 @@ macos-*) test -z "$BREW_INSTALL_PACKAGES" || brew install $BREW_INSTALL_PACKAGES brew link --force gettext - mkdir -p $HOME/bin - ( - cd $HOME/bin + + mkdir -p "$P4_PATH" + pushd "$P4_PATH" wget -q "$P4WHENCE/bin.macosx1015x86_64/helix-core-server.tgz" && tar -xf helix-core-server.tgz && sudo xattr -d com.apple.quarantine p4 p4d 2>/dev/null || true - ) - PATH="$PATH:${HOME}/bin" - export PATH + popd if test -n "$CC_PACKAGE" then |