[spark] branch master updated: [SPARK-31567][R][TESTS] Update AppVeyor Rtools to 4.0.0

[gu...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 62be65e  [SPARK-31567][R][TESTS] Update AppVeyor Rtools to 4.0.0
62be65e is described below

commit 62be65efe48eb079847de1b7b301accee5b07ac4
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Wed Apr 29 13:10:43 2020 +0900

    [SPARK-31567][R][TESTS] Update AppVeyor Rtools to 4.0.0
    
    ### What changes were proposed in this pull request?
    
    This aims to upgrade Rtools first to prepare R 4.0.0 in AppVeyor for Apache Spark 3.1.0.
    
    ### Why are the changes needed?
    
    R 4.0.0 is released on April 24th, 2020. It uses Rtools 4.0.0 officially.
    - https://cran.r-project.org/doc/manuals/r-release/NEWS.html
    - https://stat.ethz.ch/pipermail/r-announce/2020/000653.html
    
    ### Does this PR introduce any user-facing change?
    
    No. (This PR aims to test Rtools 4.0.0 in AppVeyor environment.)
    
    ### How was this patch tested?
    
    See the AppVeyor result.
    
    Closes #28358 from dongjoon-hyun/SPARK-31567.
    
    Authored-by: Dongjoon Hyun <do...@apache.org>
    Signed-off-by: HyukjinKwon <gu...@apache.org>
---
 dev/appveyor-install-dependencies.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/appveyor-install-dependencies.ps1 b/dev/appveyor-install-dependencies.ps1
index 1658cca..4be420b 100644
--- a/dev/appveyor-install-dependencies.ps1
+++ b/dev/appveyor-install-dependencies.ps1
@@ -50,7 +50,7 @@ Function InstallR {
 
 Function InstallRtools {
   $rtoolsver = $rToolsVer.Split('.')[0..1] -Join ''
-  $rtoolsurl = $CRAN + "/bin/windows/Rtools/Rtools$rtoolsver.exe"
+  $rtoolsurl = $CRAN + "/bin/windows/Rtools/rtools$rtoolsver-x86_64.exe"
 
   # Downloading Rtools
   Start-FileDownload $rtoolsurl "Rtools-current.exe"
@@ -67,8 +67,8 @@ Function InstallRtools {
   Else {
     $gccPath = $env:GCC_PATH
   }
-  $env:PATH = $RtoolsDrive + '\Rtools\bin;' + $RtoolsDrive + '\Rtools\MinGW\bin;' + $RtoolsDrive + '\Rtools\' + $gccPath + '\bin;' + $env:PATH
-  $env:BINPREF=$RtoolsDrive + '/Rtools/mingw_$(WIN)/bin/'
+  $env:PATH = $RtoolsDrive + '\Rtools40\bin;' + $RtoolsDrive + '\Rtools40\MinGW$(WIN)\bin;' + $RtoolsDrive + '\Rtools40\' + $gccPath + '\bin;' + $env:PATH
+  $env:BINPREF=$RtoolsDrive + '/Rtools40/mingw$(WIN)/bin/'
 }
 
 # create tools directory outside of Spark directory
@@ -116,7 +116,7 @@ Pop-Location
 
 # ========================== R
 $rVer = "3.6.2"
-$rToolsVer = "3.5.1"
+$rToolsVer = "4.0.0"
 
 InstallR
 InstallRtools


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org