Skip to content

Commit f06534d

Browse files
authored
Merge branch 'master' into alter-lcase-vol3
2 parents 8a79827 + a474b88 commit f06534d

File tree

639 files changed

+21770
-6020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

639 files changed

+21770
-6020
lines changed

.github/workflows/build_sparkr_window.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# specific language governing permissions and limitations
1717
# under the License.
1818
#
19-
name: "Build / SparkR-only (master, 4.3.3, windows-2019)"
19+
name: "Build / SparkR-only (master, 4.4.0, windows-2022)"
2020

2121
on:
2222
schedule:
@@ -25,7 +25,7 @@ on:
2525
jobs:
2626
build:
2727
name: "Build module: sparkr"
28-
runs-on: windows-2019
28+
runs-on: windows-2022
2929
timeout-minutes: 300
3030
if: github.repository == 'apache/spark'
3131
steps:
@@ -35,7 +35,7 @@ jobs:
3535
repository: cdarlint/winutils
3636
- name: Move Hadoop winutil into home directory
3737
run: |
38-
Move-Item -Path hadoop-3.3.5 -Destination ~\
38+
Move-Item -Path hadoop-3.3.6 -Destination ~\
3939
- name: Checkout Spark repository
4040
uses: actions/checkout@v4
4141
- name: Cache Maven local repository
@@ -50,10 +50,10 @@ jobs:
5050
with:
5151
distribution: zulu
5252
java-version: 17
53-
- name: Install R 4.3.3
53+
- name: Install R 4.4.0
5454
uses: r-lib/actions/setup-r@v2
5555
with:
56-
r-version: 4.3.3
56+
r-version: 4.4.0
5757
- name: Install R dependencies
5858
run: |
5959
Rscript -e "install.packages(c('knitr', 'rmarkdown', 'testthat', 'e1071', 'survival', 'arrow', 'xml2'), repos='https://cloud.r-project.org/')"
@@ -79,7 +79,7 @@ jobs:
7979
shell: cmd
8080
- name: Run SparkR tests
8181
run: |
82-
set HADOOP_HOME=%USERPROFILE%\hadoop-3.3.5
82+
set HADOOP_HOME=%USERPROFILE%\hadoop-3.3.6
8383
set PATH=%HADOOP_HOME%\bin;%PATH%
8484
.\bin\spark-submit2.cmd --driver-java-options "-Dlog4j.configurationFile=file:///%CD:\=/%/R/log4j2.properties" --conf spark.hadoop.fs.defaultFS="file:///" R\pkg\tests\run-all.R
8585
shell: cmd

0 commit comments

Comments
 (0)