From ddefe9cd0c08b0bf3b176136c5c52240111d4796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 12:24:52 +0200 Subject: [PATCH 1/7] ARROW-16278: [CI] Add link and conflicts for git if already installed --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 52b86e4527a..a552ba55e9b 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,7 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -brew "git" +brew "git", link: true, conflicts_with: ["git"] brew "glog" brew "grpc" brew "llvm" From c725242975088d64840748e91bd1d7366d960370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 13:12:24 +0200 Subject: [PATCH 2/7] ARROW-16278: [CI] Force brew to use git 2.35.1 --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index a552ba55e9b..b2f2802d163 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,7 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -brew "git", link: true, conflicts_with: ["git"] +brew "git@2.35.1" brew "glog" brew "grpc" brew "llvm" From f6977d8a8d16a7739b2565696e3bb8d836244de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 16:10:45 +0200 Subject: [PATCH 3/7] ARROW-16278: [CI] Try a different approach to avoid fixing version --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index b2f2802d163..0834c151a22 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,7 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -brew "git@2.35.1" +brew link --overwrite "git" brew "glog" brew "grpc" brew "llvm" From 3f81b97564f02f655565885d7d2b216f224783db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 16:27:12 +0200 Subject: [PATCH 4/7] Try and use brew casks with autoupdate to last version --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 0834c151a22..7adedce5c56 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,7 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -brew link --overwrite "git" +cask "git", greedy: true brew "glog" brew "grpc" brew "llvm" From 047a833bb2f4190ffd0222dc6366f0a2df52cf0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 16:43:11 +0200 Subject: [PATCH 5/7] Try brew with greedy and link --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 7adedce5c56..12eb5c4107f 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,7 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -cask "git", greedy: true +brew "git", greedy: true, link: true brew "glog" brew "grpc" brew "llvm" From 0493ff1c92959c8a2c61515249444027f4ef8901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 17:19:19 +0200 Subject: [PATCH 6/7] Try only adding conflicts_with --- cpp/Brewfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 12eb5c4107f..2f2abb74fce 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,7 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -brew "git", greedy: true, link: true +brew "git", conflicts_with: ["git"] brew "glog" brew "grpc" brew "llvm" From 858526e691df29ff06447c8dc7987e0ab01c7b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Fri, 22 Apr 2022 17:29:37 +0200 Subject: [PATCH 7/7] Test what happens if remove git from Brewfile --- cpp/Brewfile | 1 - 1 file changed, 1 deletion(-) diff --git a/cpp/Brewfile b/cpp/Brewfile index 2f2abb74fce..00116896150 100644 --- a/cpp/Brewfile +++ b/cpp/Brewfile @@ -23,7 +23,6 @@ brew "c-ares" brew "ccache" brew "cmake" brew "flatbuffers" -brew "git", conflicts_with: ["git"] brew "glog" brew "grpc" brew "llvm"