diff --git a/dev/appveyor-install-dependencies.ps1 b/dev/appveyor-install-dependencies.ps1 index be08a1e76900d..e344a7fc23191 100644 --- a/dev/appveyor-install-dependencies.ps1 +++ b/dev/appveyor-install-dependencies.ps1 @@ -67,8 +67,8 @@ Function InstallRtools { Else { $gccPath = $env:GCC_PATH } - $env:PATH = $RtoolsDrive + '\Rtools40\bin;' + $RtoolsDrive + '\Rtools40\MinGW$(WIN)\bin;' + $RtoolsDrive + '\Rtools40\' + $gccPath + '\bin;' + $env:PATH - $env:BINPREF=$RtoolsDrive + '/Rtools40/mingw$(WIN)/bin/' + $env:PATH = $RtoolsDrive + '\Rtools40\bin;' + $RtoolsDrive + '\Rtools40\mingw64\bin;' + $RtoolsDrive + '\Rtools40\' + $gccPath + '\bin;' + $env:PATH + $env:BINPREF=$RtoolsDrive + '/Rtools40/mingw64/bin/' } # create tools directory outside of Spark directory @@ -95,22 +95,22 @@ $env:MAVEN_OPTS = "-Xmx2g -XX:ReservedCodeCacheSize=1g" Pop-Location # ========================== Hadoop bin package -# This must match the version at https://github.com/steveloughran/winutils/tree/master/hadoop-3.0.0 -$hadoopVer = "3.0.0" +# This must match the version at https://github.com/cdarlint/winutils/tree/master/hadoop-3.2.0 +$hadoopVer = "3.2.0" $hadoopPath = "$tools\hadoop" if (!(Test-Path $hadoopPath)) { New-Item -ItemType Directory -Force -Path $hadoopPath | Out-Null } Push-Location $hadoopPath -Start-FileDownload "https://github.com/steveloughran/winutils/archive/master.zip" "winutils-master.zip" +Start-FileDownload "https://codeload.github.com/cdarlint/winutils/zip/master" "winutils-master.zip" # extract Invoke-Expression "7z.exe x winutils-master.zip" # add hadoop bin to environment variables -$env:HADOOP_HOME = "$hadoopPath/winutils-master/hadoop-$hadoopVer" -$env:Path += ";$env:HADOOP_HOME\bin" +$env:HADOOP_HOME = "$hadoopPath\winutils-master\hadoop-$hadoopVer" +$env:PATH = "$env:HADOOP_HOME\bin;" + $env:PATH Pop-Location