Skip to content

Commit 31b4c07

Browse files
NvTimLiuNvTimLiu
authored
Merge pull request #10982 from NVIDIA/merge-branch-24.06-to-main
Merge branch-24.06 into main [skip ci]
2 parents f5090ba + 0dff8e8 commit 31b4c07

File tree

439 files changed

+8067
-1664
lines changed

Some content is hidden

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

439 files changed

+8067
-1664
lines changed

‎.github/workflows/add-to-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
1+
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ jobs:
2828
name: Add new issues and pull requests to project
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/add-to-project@v0.4.0
31+
- uses: actions/add-to-project@v0.6.1
3232
with:
3333
project-url: https://github.com/orgs/NVIDIA/projects/4
3434
github-token: ${{ secrets.PROJECT_TOKEN }}

‎.github/workflows/auto-merge.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ name: auto-merge HEAD to BASE
1818
on:
1919
pull_request_target:
2020
branches:
21-
- branch-24.04
21+
- branch-24.06
2222
types: [closed]
2323

2424
jobs:
@@ -27,15 +27,15 @@ jobs:
2727
runs-on: ubuntu-latest
2828

2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131
with:
32-
ref: branch-24.04 # force to fetch from latest upstream instead of PR ref
32+
ref: branch-24.06 # force to fetch from latest upstream instead of PR ref
3333

3434
- name: auto-merge job
3535
uses: ./.github/workflows/auto-merge
3636
env:
3737
OWNER: NVIDIA
3838
REPO_NAME: spark-rapids
39-
HEAD: branch-24.04
40-
BASE: branch-24.06
39+
HEAD: branch-24.06
40+
BASE: branch-24.08
4141
AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR

‎.github/workflows/blossom-ci.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,17 @@ jobs:
3535
# This job only runs for pull request comments
3636
if: contains( '\
3737
abellina,\
38-
andygrove,\
3938
anfeng,\
4039
firestarman,\
4140
GaryShen2008,\
42-
jbrennan333, \
4341
jlowe,\
44-
krajendrannv,\
4542
kuhushukla,\
4643
mythrocks,\
4744
nartal1,\
4845
nvdbaranec,\
4946
NvTimLiu,\
5047
razajafri,\
5148
revans2,\
52-
rongou,\
5349
rwlee,\
5450
sameerz,\
5551
tgravescs,\
@@ -72,6 +68,8 @@ jobs:
7268
viadea,\
7369
yinqingh,\
7470
parthosa,\
71+
liurenjie1024,\
72+
binmahone,\
7573
', format('{0},', github.actor)) && github.event.comment.body == 'build'
7674
steps:
7775
- name: Check if comment is issued by authorized person

‎.github/workflows/markdown-links-check/markdown-links-check-config.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
},
1515
{
1616
"pattern": "https://www.nvidia.com/en-us/security/pgp-key"
17+
},
18+
{
19+
"pattern": "https://repo1.maven.org/maven2/com/nvidia/rapids-4-spark_2.*"
1720
}
1821
],
1922
"timeout": "15s",

‎.github/workflows/mvn-verify-check.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
sparkJDKVersions: ${{ steps.allShimVersionsStep.outputs.jdkVersions }}
4646
scala213Versions: ${{ steps.allShimVersionsStep.outputs.scala213Versions }}
4747
steps:
48-
- uses: actions/checkout@v3 # refs/pull/:prNumber/merge
49-
- uses: actions/setup-java@v3
48+
- uses: actions/checkout@v4 # refs/pull/:prNumber/merge
49+
- uses: actions/setup-java@v4
5050
with:
5151
distribution: 'temurin'
5252
java-version: 8
@@ -58,7 +58,7 @@ jobs:
5858
echo "dailyCacheKey=$cacheKey" | tee $GITHUB_ENV $GITHUB_OUTPUT
5959
- name: Cache local Maven repository
6060
id: cache
61-
uses: actions/cache@v3
61+
uses: actions/cache@v4
6262
with:
6363
path: ~/.m2
6464
key: ${{ env.dailyCacheKey }}
@@ -146,16 +146,16 @@ jobs:
146146
fail-fast: false
147147
runs-on: ubuntu-latest
148148
steps:
149-
- uses: actions/checkout@v3 # refs/pull/:prNumber/merge
149+
- uses: actions/checkout@v4 # refs/pull/:prNumber/merge
150150

151151
- name: Setup Java and Maven Env
152-
uses: actions/setup-java@v3
152+
uses: actions/setup-java@v4
153153
with:
154154
distribution: adopt
155155
java-version: 8
156156

157157
- name: Cache local Maven repository
158-
uses: actions/cache@v3
158+
uses: actions/cache@v4
159159
with:
160160
path: ~/.m2
161161
key: ${{ needs.cache-dependencies.outputs.dailyCacheKey }}
@@ -195,16 +195,16 @@ jobs:
195195
fail-fast: false
196196
runs-on: ubuntu-latest
197197
steps:
198-
- uses: actions/checkout@v3 # refs/pull/:prNumber/merge
198+
- uses: actions/checkout@v4 # refs/pull/:prNumber/merge
199199

200200
- name: Setup Java and Maven Env
201-
uses: actions/setup-java@v3
201+
uses: actions/setup-java@v4
202202
with:
203203
distribution: adopt
204204
java-version: 8
205205

206206
- name: Cache local Maven repository
207-
uses: actions/cache@v3
207+
uses: actions/cache@v4
208208
with:
209209
path: ~/.m2
210210
key: ${{ needs.cache-dependencies.outputs.dailyCacheKey }}
@@ -253,16 +253,16 @@ jobs:
253253
strategy:
254254
matrix: ${{ fromJSON(needs.cache-dependencies.outputs.sparkJDKVersions) }}
255255
steps:
256-
- uses: actions/checkout@v3 # refs/pull/:prNumber/merge
256+
- uses: actions/checkout@v4 # refs/pull/:prNumber/merge
257257

258258
- name: Setup Java and Maven Env
259-
uses: actions/setup-java@v3
259+
uses: actions/setup-java@v4
260260
with:
261261
distribution: adopt
262262
java-version: ${{ matrix.java-version }}
263263

264264
- name: Cache local Maven repository
265-
uses: actions/cache@v3
265+
uses: actions/cache@v4
266266
with:
267267
path: ~/.m2
268268
key: ${{ needs.cache-dependencies.outputs.dailyCacheKey }}
@@ -300,16 +300,16 @@ jobs:
300300
matrix:
301301
maven-version: [3.6.3, 3.8.8, 3.9.3]
302302
steps:
303-
- uses: actions/checkout@v3 # refs/pull/:prNumber/merge
303+
- uses: actions/checkout@v4 # refs/pull/:prNumber/merge
304304

305305
- name: Setup Java
306-
uses: actions/setup-java@v3
306+
uses: actions/setup-java@v4
307307
with:
308308
distribution: adopt
309309
java-version: 11
310310

311311
- name: Cache local Maven repository
312-
uses: actions/cache@v3
312+
uses: actions/cache@v4
313313
with:
314314
path: ~/.m2
315315
key: ${{ needs.cache-dependencies.outputs.dailyCacheKey }}

‎.github/workflows/signoff-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020-2022, NVIDIA CORPORATION.
1+
# Copyright (c) 2020-2024, NVIDIA CORPORATION.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ jobs:
2323
signoff-check:
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727

2828
- name: sigoff-check job
2929
uses: ./.github/workflows/signoff-check

0 commit comments

Comments
 (0)