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/lib.sh | |
| parent | c7c0811fd09d491cf642906f18f10eceb2066588 (diff) | |
| parent | 56090a35ab20c21ef577bd1ed2d9d5b63eb5f649 (diff) | |
| download | git-93bc02f8f958085aaa41ccfa2b3cb400405b7b34.tar.xz | |
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/lib.sh')
| -rwxr-xr-x | ci/lib.sh | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -252,7 +252,14 @@ then CI_COMMIT="$CI_COMMIT_SHA" case "$CI_JOB_IMAGE" in macos-*) - CI_OS_NAME=osx;; + # GitLab CI has Python installed via multiple package managers, + # most notably via asdf and Homebrew. Ensure that our builds + # pick up the Homebrew one by prepending it to our PATH as the + # asdf one breaks tests. + export PATH="$(brew --prefix)/bin:$PATH" + + CI_OS_NAME=osx + ;; alpine:*|fedora:*|ubuntu:*) CI_OS_NAME=linux;; *) @@ -344,6 +351,9 @@ macos-*) then MAKEFLAGS="$MAKEFLAGS APPLE_COMMON_CRYPTO_SHA1=Yes" fi + + P4_PATH="$HOME/custom/p4" + export PATH="$P4_PATH:$PATH" ;; esac |