Merge pull request #6296 from rjbou/ci-patch-homebrew

CI: fix MacOS jobs regarding gpatch
ocaml · Nov 14, 2024 · b34f7ec · b34f7ec
2 parents 13f49bf + 565711f
commit b34f7ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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]