Skip to content

Commit 5c28b6e

Browse files
committed
Revert "[SPARK-37103][INFRA] Switch from Maven to SBT to build Spark on AppVeyor"
This reverts commit 3fc16fc.
1 parent 3fc16fc commit 5c28b6e

File tree

4 files changed

+9
-31
lines changed

4 files changed

+9
-31
lines changed

appveyor.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ cache:
3939
- C:\Users\appveyor\.m2
4040

4141
install:
42-
# Install SBT and dependencies
42+
# Install maven and dependencies
4343
- ps: .\dev\appveyor-install-dependencies.ps1
4444
# Required package for R unit tests. xml2 is required to use jUnit reporter in testthat.
4545
- cmd: Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival', 'arrow', 'xml2'), repos='https://cloud.r-project.org/')"
@@ -49,11 +49,7 @@ build_script:
4949
# '-Djna.nosys=true' is required to avoid kernel32.dll load failure.
5050
# See SPARK-28759.
5151
# Ideally we should check the tests related to Hive in SparkR as well (SPARK-31745).
52-
- cmd: set SBT_MAVEN_PROFILES=-Psparkr
53-
- cmd: set SBT_OPTS=-Djna.nosys=true -Dfile.encoding=UTF-8 -Xms4096m -Xms4096m -XX:ReservedCodeCacheSize=128m
54-
- cmd: sbt package
55-
- cmd: set SBT_MAVEN_PROFILES=
56-
- cmd: set SBT_OPTS=
52+
- cmd: mvn -DskipTests -Psparkr -Djna.nosys=true package
5753

5854
environment:
5955
NOT_CRAN: true

dev/appveyor-install-dependencies.ps1

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -79,32 +79,18 @@ if (!(Test-Path $tools)) {
7979
}
8080

8181
# ========================== Maven
82-
# Push-Location $tools
83-
#
84-
# $mavenVer = "3.6.3"
85-
# Start-FileDownload "https://archive.apache.org/dist/maven/maven-3/$mavenVer/binaries/apache-maven-$mavenVer-bin.zip" "maven.zip"
86-
#
87-
# # extract
88-
# Invoke-Expression "7z.exe x maven.zip"
89-
#
90-
# # add maven to environment variables
91-
# $env:PATH = "$tools\apache-maven-$mavenVer\bin;" + $env:PATH
92-
# $env:M2_HOME = "$tools\apache-maven-$mavenVer"
93-
# $env:MAVEN_OPTS = "-Xmx2g -XX:ReservedCodeCacheSize=1g"
94-
#
95-
# Pop-Location
96-
97-
# ========================== SBT
9882
Push-Location $tools
9983

100-
$sbtVer = "1.5.5"
101-
Start-FileDownload "https://github.com/sbt/sbt/releases/download/v$sbtVer/sbt-$sbtVer.zip" "sbt.zip"
84+
$mavenVer = "3.6.3"
85+
Start-FileDownload "https://archive.apache.org/dist/maven/maven-3/$mavenVer/binaries/apache-maven-$mavenVer-bin.zip" "maven.zip"
10286

10387
# extract
104-
Invoke-Expression "7z.exe x sbt.zip"
88+
Invoke-Expression "7z.exe x maven.zip"
10589

10690
# add maven to environment variables
107-
$env:PATH = "$tools\sbt\bin;" + $env:PATH
91+
$env:PATH = "$tools\apache-maven-$mavenVer\bin;" + $env:PATH
92+
$env:M2_HOME = "$tools\apache-maven-$mavenVer"
93+
$env:MAVEN_OPTS = "-Xmx2g -XX:ReservedCodeCacheSize=1g"
10894

10995
Pop-Location
11096

project/SparkBuild.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,7 @@ object SparkR {
917917
val buildRPackage = taskKey[Unit]("Build the R package")
918918
lazy val settings = Seq(
919919
buildRPackage := {
920-
val postfix = if (File.separator == "\\") ".bat" else ".sh"
921-
val command = baseDirectory.value / ".." / "R" / s"install-dev$postfix"
920+
val command = baseDirectory.value / ".." / "R" / "install-dev.sh"
922921
Process(command.toString).!!
923922
},
924923
(Compile / compile) := (Def.taskDyn {

project/build.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
18-
# If you change sbt.version, please change the version
19-
# specified in appveyor-install-dependencies.ps1 too.
2017
sbt.version=1.5.5

0 commit comments

Comments
 (0)