From 529cb37a2f5afee328ce3f293cfd6f3823beb3cf Mon Sep 17 00:00:00 2001
From: Jia Yu <jiayu@apache.org>
Date: Thu, 7 Nov 2024 18:26:55 -0800
Subject: [PATCH] [CI] Upgrade upload-artifact to v4 (#1678)

* Upgrade upload-artifact to v4

* Upgrade cibuildwheel version

* Trigger CI for python buildWheel
---
 .github/workflows/docs.yml         | 2 +-
 .github/workflows/java.yml         | 4 ++--
 .github/workflows/python-wheel.yml | 6 ++++--
 .github/workflows/r.yml            | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 863a82615e..43a3bae6e0 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -82,7 +82,7 @@ jobs:
           fi
       - run: mkdir staging
       - run: cp -r site/* staging/
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: generated-docs
           path: staging
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 7ae7d56ce2..f17a746af8 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -111,7 +111,7 @@ jobs:
       - run: cp spark-shaded/target/sedona-*.jar staging
       - run: |
           [ -d "flink-shaded/target/" ] && cp flink-shaded/target/sedona-*.jar staging 2>/dev/null || true
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: generated-jars ${{ matrix.spark }} ${{ matrix.scala }} ${{ matrix.jdk }}
+          name: generated-jars_spark-${{ matrix.spark }}_scala-${{ matrix.scala }}_jdk-${{ matrix.jdk }}
           path: staging
diff --git a/.github/workflows/python-wheel.yml b/.github/workflows/python-wheel.yml
index c762f01ad3..3ddf8dabfc 100644
--- a/.github/workflows/python-wheel.yml
+++ b/.github/workflows/python-wheel.yml
@@ -37,6 +37,7 @@ on:
       - 'spark-shaded/**'
       - 'pom.xml'
       - 'python/**'
+      - '.github/workflows/python-wheel.yml'
 
 jobs:
   build:
@@ -55,7 +56,7 @@ jobs:
         with:
           platforms: all
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.20.0
+        uses: pypa/cibuildwheel@v2.21.3
         env:
           CIBW_SKIP: 'pp* *musl*'
           CIBW_ARCHS_LINUX: 'x86_64 aarch64'
@@ -63,6 +64,7 @@ jobs:
           CIBW_ARCHS_MACOS: 'x86_64 arm64'
         with:
           package-dir: python
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index baab42257d..51a33531f2 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -139,7 +139,7 @@ jobs:
           cd ./R/tests
           NOT_CRAN='true' Rscript testthat.R
         shell: bash
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: Worker logs