From 565711f9e123d05f402d213bcbc2c7a9aa030ca4 Mon Sep 17 00:00:00 2001 From: Kate Date: Wed, 13 Nov 2024 00:55:48 +0000 Subject: [PATCH] Update the github action scripts now that homebrew renamed the GNU patch binary to gpatch (see Homebrew/homebrew-core#174687) --- .github/scripts/main/preamble.sh | 1 + master_changes.md | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/scripts/main/preamble.sh b/.github/scripts/main/preamble.sh index 7e46cedd6d3..e15bd61422f 100644 --- a/.github/scripts/main/preamble.sh +++ b/.github/scripts/main/preamble.sh @@ -12,6 +12,7 @@ OCAML_LOCAL=$CACHE/ocaml-local OPAM_LOCAL=$CACHE/opam-local if [ "$RUNNER_OS" = 'macOS' ]; then PATH="/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH" + PATH="/opt/homebrew/opt/gpatch/libexec/gnubin:$PATH" fi PATH=$OPAM_LOCAL/bin:$OCAML_LOCAL/bin:$PATH; export PATH diff --git a/master_changes.md b/master_changes.md index 6fad0034d68..bf99e35d587 100644 --- a/master_changes.md +++ b/master_changes.md @@ -126,6 +126,7 @@ users) ## Github Actions * Add a doc generation job under linux [#5349 @rjbou] + * Update the github action scripts now that homebrew renamed the GNU patch binary to gpatch [#6296 @kit-ty-kate] ## Doc * Update the command to install opam to point to the new simplified url on opam.ocaml.org [#6226 @kit-ty-kate]