diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 939fa60434..5942e13266 100644 --- a/.github/workflows/add-to-project.yml +++ b/.github/workflows/add-to-project.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ jobs: name: Add new issues and pull requests to project runs-on: ubuntu-latest steps: - - uses: actions/add-to-project@v0.4.0 + - uses: actions/add-to-project@v0.6.1 with: project-url: https://github.com/orgs/NVIDIA/projects/4 github-token: ${{ secrets.PROJECT_TOKEN }} diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 08ee4f34d8..c6de34764b 100755 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -18,12 +18,12 @@ name: auto-merge HEAD to BASE on: pull_request_target: branches: - - branch-24.02 + - branch-24.04 types: [closed] env: - HEAD: branch-24.02 - BASE: branch-24.04 + HEAD: branch-24.04 + BASE: branch-24.06 jobs: auto-merge: @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.HEAD }} # force to fetch from latest upstream instead of PR ref token: ${{ secrets.AUTOMERGE_TOKEN }} # workaround auto-merge token to avoid GITHUB_TOKEN insufficient permission @@ -42,13 +42,17 @@ jobs: git config user.email "70000568+nvauto@users.noreply.github.com " git fetch origin ${HEAD} ${BASE} git checkout -b ${INTERMEDIATE_HEAD} origin/${HEAD} - OUT=$(git --no-pager diff --name-only origin/${BASE} | grep "${FILE_USE_BASE}" || true) - [[ ! -z "${OUT}" ]] && git checkout origin/${BASE} -- ${FILE_USE_BASE} && \ - git commit -s -am "Auto-merge use submodule in BASE ref" + # Sync the $BASE branch with the commits from the $HEAD branch, + # excluding the paths defined as $FILE_USE_BASE (located under ./thirdparty). + git checkout origin/${BASE} -- ${FILE_USE_BASE} + # If any submodule file is updated in the HEAD branch, + # always change it to the corresponding one from the BASE branch. + [ ! -z "$(git status --porcelain=v1 --untracked=no)" ] && \ + git commit -s -am "Auto-merge use ${BASE} versions" git push origin ${INTERMEDIATE_HEAD} -f env: INTERMEDIATE_HEAD: bot-auto-merge-${{ env.HEAD }} - FILE_USE_BASE: thirdparty/cudf + FILE_USE_BASE: thirdparty/cudf thirdparty/cudf-pins - name: auto-merge job uses: ./.github/workflows/action-helper diff --git a/.github/workflows/blossom-ci.yml b/.github/workflows/blossom-ci.yml index 8aa90b9ee6..ece14b4201 100644 --- a/.github/workflows/blossom-ci.yml +++ b/.github/workflows/blossom-ci.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ jobs: wbo4958,\ wjxiz1992,\ sperlingxx,\ - pxLi,\ + YanxuanLiu,\ hyperbolic2346,\ gerashegalov,\ ttnghia,\ @@ -65,6 +65,7 @@ jobs: NVnavkumar,\ yinqingh,\ thirtiseven,\ + parthosa,\ ', format('{0},', github.actor)) && github.event.comment.body == 'build' steps: - name: Check if comment is issued by authorized person diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 2cb86b2865..267e6395e4 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 with: submodules: true - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" - uses: pre-commit/action@v3.0.0 diff --git a/.github/workflows/signoff-check.yml b/.github/workflows/signoff-check.yml index c2d1d6bf31..4a0eece7d1 100755 --- a/.github/workflows/signoff-check.yml +++ b/.github/workflows/signoff-check.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2022, NVIDIA CORPORATION. +# Copyright (c) 2022-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ jobs: signoff-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: sigoff-check job uses: ./.github/workflows/signoff-check diff --git a/.gitmodules b/.gitmodules index 6b6f69d695..103a678946 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "thirdparty/cudf"] path = thirdparty/cudf url = https://github.com/rapidsai/cudf.git - branch = branch-24.02 + branch = branch-24.04 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5fb76d548e..60dd78e5d8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -160,7 +160,7 @@ $ ./build/build-in-docker install ... ``` Now cd to ~/repos/NVIDIA/spark-rapids and build with one of the options from -[spark-rapids instructions](https://github.com/NVIDIA/spark-rapids/blob/branch-24.02/CONTRIBUTING.md#building-from-source). +[spark-rapids instructions](https://github.com/NVIDIA/spark-rapids/blob/branch-24.04/CONTRIBUTING.md#building-from-source). ```bash $ ./build/buildall diff --git a/build-libcudf.xml b/build-libcudf.xml index f4068c180d..765f50e8a0 100644 --- a/build-libcudf.xml +++ b/build-libcudf.xml @@ -1,6 +1,6 @@