From: Matthew Fernandez Date: Thu, 13 May 2021 02:10:54 +0000 (-0700) Subject: remove Windows CI check for grep X-Git-Tag: 2.47.2~4^2~3 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a37b90a515dd6dbd8d607a307443dbfe3a5b3a9f;p=graphviz remove Windows CI check for grep Following the prior changes, grep is no longer a build dependency on Windows. Related to #2069. --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 4511ddb09..78b9299e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - $PATH is no longer assumed to be "/bin:/usr/bin:/usr/local/bin" if unset - test suite no longer assumes `python3` exists #2049 - CMake build system locates Python 3 before calling it +- grep is no longer required to build Graphviz on Windows ### Fixed diff --git a/windows/bin/setup-build-utilities.ps1 b/windows/bin/setup-build-utilities.ps1 index 14b99039b..6aa11f0cf 100644 --- a/windows/bin/setup-build-utilities.ps1 +++ b/windows/bin/setup-build-utilities.ps1 @@ -53,7 +53,7 @@ find_or_fallback "awk sed swig" "$build_utilities_path" find_or_fallback "win_bison win_flex" "$build_utilities_path\winflexbison" find_or_fallback "makensis" "$build_utilities_path\NSIS\Bin" find_or_fallback "perl" "$build_utilities_path\Perl64\Bin" -find_or_fallback "diff grep" "$build_utilities_path\GnuWin\bin" +find_or_fallback "diff" "$build_utilities_path\GnuWin\bin" find_or_fallback "cmake cpack" "$CMAKE_BIN" find_or_fallback "msbuild" "$MSBUILD_BIN"