From d853c259a75a79328631b746182a2ad72d54ccbf Mon Sep 17 00:00:00 2001 From: YanxuanLiu <104543031+YanxuanLiu@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:27:04 +0800 Subject: [PATCH 1/2] Update actions version [skip ci] (#1898) * change container name Signed-off-by: YanxuanLiu * update actions version Signed-off-by: YanxuanLiu * update 2024 copyright Signed-off-by: YanxuanLiu --------- Signed-off-by: YanxuanLiu --- .github/workflows/add-to-project.yml | 4 ++-- .github/workflows/auto-merge.yml | 2 +- .github/workflows/blossom-ci.yml | 4 ++-- .github/workflows/clang-format.yml | 4 ++-- .github/workflows/signoff-check.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/add-to-project.yml b/.github/workflows/add-to-project.yml index 939fa6043..5942e1326 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 455110377..fc1b22e3c 100755 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -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 diff --git a/.github/workflows/blossom-ci.yml b/.github/workflows/blossom-ci.yml index ece14b420..2d09c02be 100644 --- a/.github/workflows/blossom-ci.yml +++ b/.github/workflows/blossom-ci.yml @@ -81,7 +81,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: ${{ fromJson(needs.Authorization.outputs.args).repo }} ref: ${{ fromJson(needs.Authorization.outputs.args).ref }} @@ -89,7 +89,7 @@ jobs: # repo specific steps - name: Setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: adopt java-version: 8 diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 2cb86b286..267e6395e 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 c2d1d6bf3..4a0eece7d 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 From 5178a9d9591735215c47790ae22305c5610c96db Mon Sep 17 00:00:00 2001 From: spark-rapids automation <70000568+nvauto@users.noreply.github.com> Date: Mon, 8 Apr 2024 01:27:16 +0000 Subject: [PATCH 2/2] Auto-merge use submodule in BASE ref Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com> --- thirdparty/cudf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/cudf b/thirdparty/cudf index 35f818b3e..c0f84bf5b 160000 --- a/thirdparty/cudf +++ b/thirdparty/cudf @@ -1 +1 @@ -Subproject commit 35f818b3e4bef8e331f083dadc9a4c45e2987a78 +Subproject commit c0f84bf5bbc7262015c42588fc1f4fd2b8e1b6c1