diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-20 22:27:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-20 22:27:00 (GMT) |
| commit | 69e3d1e550a6ab05762ec1ad84f985a68ff779f1 (patch) | |
| tree | efd0ba8fa7ee3fb1efc510fcbca4f86d7ed97c46 /notes-merge.h | |
| parent | 3af1df0415741c85f84e78e281339186be1d05d7 (diff) | |
| parent | f15e00b463b4dceaf5b260883975e93c24581b2c (diff) | |
| download | git-69e3d1e550a6ab05762ec1ad84f985a68ff779f1.zip git-69e3d1e550a6ab05762ec1ad84f985a68ff779f1.tar.gz git-69e3d1e550a6ab05762ec1ad84f985a68ff779f1.tar.bz2 | |
Merge branch 'cb/ci-make-p4-optional'
macOS CI jobs have been occasionally flaky due to tentative version
skew between perforce and the homebrew packager. Instead of
failing the whole CI job, just let it skip the p4 tests when this
happens.
* cb/ci-make-p4-optional:
ci: use https, not http to download binaries from perforce.com
ci: reintroduce prevention from perforce being quarantined in macOS
ci: avoid brew for installing perforce
ci: make failure to find perforce more user friendly
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions