[arrow] branch master updated: ARROW-13743: [CI] OSX job fails due to incompatible git and libcurl

[ks...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 67b5bd2  ARROW-13743: [CI] OSX job fails due to incompatible git and libcurl
67b5bd2 is described below

commit 67b5bd28ad45e340326988fbe385806fa14c8120
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Tue Sep 7 11:14:59 2021 +0200

    ARROW-13743: [CI] OSX job fails due to incompatible git and libcurl
    
    Closes #11095 from kszucs/ARROW-13743
    
    Authored-by: Krisztián Szűcs <sz...@gmail.com>
    Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
 dev/tasks/conda-recipes/azure.osx.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tasks/conda-recipes/azure.osx.yml b/dev/tasks/conda-recipes/azure.osx.yml
index d3cbcbb..99bb76b 100755
--- a/dev/tasks/conda-recipes/azure.osx.yml
+++ b/dev/tasks/conda-recipes/azure.osx.yml
@@ -18,6 +18,7 @@ jobs:
 
   - script: |
       source activate base
+      conda config --set channel_priority strict
       conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=3 conda-build
     displayName: 'Add conda-forge-ci-setup=3'
 
@@ -27,7 +28,6 @@ jobs:
       /usr/bin/sudo -k
     displayName: Mangle homebrew
 
-
   {{ macros.azure_checkout_arrow() }}
 
   - script: |
@@ -37,7 +37,7 @@ jobs:
       setup_conda_rc ./ ./ ./.ci_support/${CONFIG}.yaml
       export CI=azure
       source run_conda_forge_build_setup
-      conda update --yes --quiet --override-channels -c conda-forge -c defaults --all
+      conda update --yes --quiet --override-channels -c conda-forge --all
     displayName: Configure conda and conda-build
     workingDirectory: arrow/dev/tasks/conda-recipes
     env: