File tree Expand file tree Collapse file tree 1 file changed +5
-13
lines changed Expand file tree Collapse file tree 1 file changed +5
-13
lines changed Original file line number Diff line number Diff line change @@ -95,30 +95,22 @@ if "%JOB%" == "Build_Debug" (
9595  exit  /B 0 
9696)
9797
98- conda create -n arrow -q -y -c conda-forge ^ 
99-       --file=ci\conda_env_python.yml ^ 
100-       python=%PYTHON%  ^ 
101-       numpy=1.14 ^ 
102-       thrift-cpp=0.11 ^ 
103-       boost-cpp
104- 
10598set  ARROW_LLVM_VERSION = 6.0.1
99+ set  CONDA_PACKAGES = --file=ci\conda_env_python.yml python=%PYTHON%  numpy=1.14 thrift-cpp=0.11 boost-cpp
106100
107101if  " %ARROW_BUILD_GANDIVA% " ==  " ON" 
108102  @ rem  Install llvmdev in the toolchain if building gandiva.dll
109-   conda install -n arrow -q -y llvmdev=%ARROW_LLVM_VERSION%  ^ 
110-         clangdev=%ARROW_LLVM_VERSION%  -c conda-forge
103+   set  CONDA_PACKAGES = %CONDA_PACKAGES%  llvmdev=%ARROW_LLVM_VERSION%  clangdev=%ARROW_LLVM_VERSION% 
111104)
112105
113106if  " %JOB% " ==  " Toolchain" 
114107  @ rem  Install pre-built "toolchain" packages for faster builds
115-   conda install -n arrow -q -y -c conda-forge ^ 
116-         --file=ci\conda_env_cpp.yml ^ 
117-         python=%PYTHON% 
118- 
108+   set  CONDA_PACKAGES = %CONDA_PACKAGES%  --file=ci\conda_env_cpp.yml
119109  set  ARROW_BUILD_TOOLCHAIN = %CONDA_PREFIX% \Library
120110)
121111
112+ conda create -n arrow -q -y %CONDA_PACKAGES%  -c conda-forge
113+ 
122114call  activate arrow
123115
124116@ rem  Use Boost from Anaconda
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments