Skip to content

Commit c5bd073

Browse files
[SPARK-32231][R][INFRA] Use Hadoop 3.2 winutils in AppVeyor build
### What changes were proposed in this pull request? This PR proposes to use Hadoop 3 winutils to make AppVeyor builds pass. Currently it's being failed as below https://ci.appveyor.com/project/ApacheSoftwareFoundation/spark/builds/33976604 ### Why are the changes needed? To recover the build in AppVeyor. ### Does this PR introduce _any_ user-facing change? No, dev-only. ### How was this patch tested? AppVeyor build will test it out. Closes #29042 from HyukjinKwon/SPARK-32231. Lead-authored-by: Dongjoon Hyun <[email protected]> Co-authored-by: Hyukjin Kwon <[email protected]> Co-authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>
1 parent 526cb2d commit c5bd073

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

dev/appveyor-install-dependencies.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ Function InstallRtools {
6767
Else {
6868
$gccPath = $env:GCC_PATH
6969
}
70-
$env:PATH = $RtoolsDrive + '\Rtools40\bin;' + $RtoolsDrive + '\Rtools40\MinGW$(WIN)\bin;' + $RtoolsDrive + '\Rtools40\' + $gccPath + '\bin;' + $env:PATH
71-
$env:BINPREF=$RtoolsDrive + '/Rtools40/mingw$(WIN)/bin/'
70+
$env:PATH = $RtoolsDrive + '\Rtools40\bin;' + $RtoolsDrive + '\Rtools40\mingw64\bin;' + $RtoolsDrive + '\Rtools40\' + $gccPath + '\bin;' + $env:PATH
71+
$env:BINPREF=$RtoolsDrive + '/Rtools40/mingw64/bin/'
7272
}
7373

7474
# create tools directory outside of Spark directory
@@ -95,22 +95,22 @@ $env:MAVEN_OPTS = "-Xmx2g -XX:ReservedCodeCacheSize=1g"
9595
Pop-Location
9696

9797
# ========================== Hadoop bin package
98-
# This must match the version at https://github.com/steveloughran/winutils/tree/master/hadoop-2.7.1
99-
$hadoopVer = "2.7.1"
98+
# This must match the version at https://github.com/cdarlint/winutils/tree/master/hadoop-3.2.0
99+
$hadoopVer = "3.2.0"
100100
$hadoopPath = "$tools\hadoop"
101101
if (!(Test-Path $hadoopPath)) {
102102
New-Item -ItemType Directory -Force -Path $hadoopPath | Out-Null
103103
}
104104
Push-Location $hadoopPath
105105

106-
Start-FileDownload "https://github.com/steveloughran/winutils/archive/master.zip" "winutils-master.zip"
106+
Start-FileDownload "https://codeload.github.com/cdarlint/winutils/zip/master" "winutils-master.zip"
107107

108108
# extract
109109
Invoke-Expression "7z.exe x winutils-master.zip"
110110

111111
# add hadoop bin to environment variables
112-
$env:HADOOP_HOME = "$hadoopPath/winutils-master/hadoop-$hadoopVer"
113-
$env:Path += ";$env:HADOOP_HOME\bin"
112+
$env:HADOOP_HOME = "$hadoopPath\winutils-master\hadoop-$hadoopVer"
113+
$env:PATH = "$env:HADOOP_HOME\bin;" + $env:PATH
114114

115115
Pop-Location
116116

0 commit comments

Comments
 (0)