From 928a8aa44d14370a2e8dfbcb3a33ed2525590373 Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Fri, 7 Mar 2025 16:22:29 -0500 Subject: [PATCH 1/3] Remove use of --no-lock with Homebrew. --- docs/workflow/requirements/macos-requirements.md | 2 +- eng/common/native/install-dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/workflow/requirements/macos-requirements.md b/docs/workflow/requirements/macos-requirements.md index e9606b12569b86..2d71a191cf50cb 100644 --- a/docs/workflow/requirements/macos-requirements.md +++ b/docs/workflow/requirements/macos-requirements.md @@ -26,5 +26,5 @@ To build the runtime repo, you will also need to install the following dependenc You can install them separately, or you can alternatively opt to install *[Homebrew](https://brew.sh/)* and use the `Brewfile` provided by the repo, which takes care of everything for you. If you go by this route, once you have *Homebrew* up and running on your machine, run the following command from the root of the repo to download and install all the necessary dependencies at once: ```bash -brew bundle --no-lock --file eng/Brewfile +brew bundle --file eng/Brewfile ``` diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index ce661e9e5cd8de..bc19ea2a0d3503 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -44,7 +44,7 @@ case "$os" in export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 # brew update --preinstall - brew bundle --no-upgrade --no-lock --file=- < Date: Fri, 7 Mar 2025 16:57:56 -0500 Subject: [PATCH 2/3] Cleanup old brewfile and fix docs. --- docs/workflow/requirements/macos-requirements.md | 2 +- eng/Brewfile | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 eng/Brewfile diff --git a/docs/workflow/requirements/macos-requirements.md b/docs/workflow/requirements/macos-requirements.md index 2d71a191cf50cb..2512e47808c6cb 100644 --- a/docs/workflow/requirements/macos-requirements.md +++ b/docs/workflow/requirements/macos-requirements.md @@ -26,5 +26,5 @@ To build the runtime repo, you will also need to install the following dependenc You can install them separately, or you can alternatively opt to install *[Homebrew](https://brew.sh/)* and use the `Brewfile` provided by the repo, which takes care of everything for you. If you go by this route, once you have *Homebrew* up and running on your machine, run the following command from the root of the repo to download and install all the necessary dependencies at once: ```bash -brew bundle --file eng/Brewfile +./eng/common/native/install-dependencies.sh ``` diff --git a/eng/Brewfile b/eng/Brewfile deleted file mode 100644 index 7a145df5dc637c..00000000000000 --- a/eng/Brewfile +++ /dev/null @@ -1,5 +0,0 @@ -brew "cmake" -brew "icu4c" -brew "openssl@3" -brew "pkg-config" -brew "python3" From cec67d7558d3e0b0d812ef36bbebc627f98e6596 Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Fri, 7 Mar 2025 17:01:57 -0500 Subject: [PATCH 3/3] More docs cleanup. --- docs/workflow/requirements/macos-requirements.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/workflow/requirements/macos-requirements.md b/docs/workflow/requirements/macos-requirements.md index 2512e47808c6cb..67e7840a64d1be 100644 --- a/docs/workflow/requirements/macos-requirements.md +++ b/docs/workflow/requirements/macos-requirements.md @@ -23,7 +23,7 @@ To build the runtime repo, you will also need to install the following dependenc - `python3` - `ninja` (This one is optional. It is an alternative tool to `make` for building native code) -You can install them separately, or you can alternatively opt to install *[Homebrew](https://brew.sh/)* and use the `Brewfile` provided by the repo, which takes care of everything for you. If you go by this route, once you have *Homebrew* up and running on your machine, run the following command from the root of the repo to download and install all the necessary dependencies at once: +You can install them separately, or you can alternatively opt to install *[Homebrew](https://brew.sh/)* and use the `install-dependencies.sh` script provided by the repo, which takes care of everything for you. If you go by this route, once you have *Homebrew* up and running on your machine, run the following command from the root of the repo to download and install all the necessary dependencies at once: ```bash ./eng/common/native/install-dependencies.sh