From f3d9aa47ab360977acd035c416f43d1e56b6fd8c Mon Sep 17 00:00:00 2001
From: chrislu <chris.lu@gmail.com>
Date: Sat, 22 Nov 2025 13:29:08 -0800
Subject: [PATCH] ci: fix artifact download path to avoid checkout conflicts

- Download artifacts to 'build-artifacts' directory instead of '.'
- Prevents checkout from overwriting downloaded files
- Explicitly copy weed binary from build-artifacts to docker/ directory
- Update Maven artifact restoration to use new path
---
 .github/workflows/spark-integration-tests.yml | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/spark-integration-tests.yml b/.github/workflows/spark-integration-tests.yml
index e953fcbfa..50b67d250 100644
--- a/.github/workflows/spark-integration-tests.yml
+++ b/.github/workflows/spark-integration-tests.yml
@@ -111,23 +111,24 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: seaweedfs-build
-        path: .
+        path: build-artifacts
 
     - name: Restore Maven repository
       run: |
         echo "Restoring Maven artifacts to ~/.m2/repository..."
         mkdir -p ~/.m2/repository/com
-        if [ -d ".m2/repository/com/seaweedfs" ]; then
-          cp -r .m2/repository/com/seaweedfs ~/.m2/repository/com/
+        if [ -d "build-artifacts/.m2/repository/com/seaweedfs" ]; then
+          cp -r build-artifacts/.m2/repository/com/seaweedfs ~/.m2/repository/com/
           echo "✓ Maven artifacts restored"
         else
           echo "⚠️ Warning: Maven artifacts not found in download"
-          ls -la
+          ls -la build-artifacts/
         fi
 
     - name: Prepare SeaweedFS binary
       run: |
-        echo "Making SeaweedFS binary executable..."
+        echo "Copying SeaweedFS binary to docker directory..."
+        cp build-artifacts/docker/weed docker/
         chmod +x docker/weed
         ls -la docker/weed
         echo "✓ Binary is ready"
@@ -237,23 +238,24 @@ jobs:
       uses: actions/download-artifact@v4
       with:
         name: seaweedfs-build
-        path: .
+        path: build-artifacts
 
     - name: Restore Maven repository
       run: |
         echo "Restoring Maven artifacts to ~/.m2/repository..."
         mkdir -p ~/.m2/repository/com
-        if [ -d ".m2/repository/com/seaweedfs" ]; then
-          cp -r .m2/repository/com/seaweedfs ~/.m2/repository/com/
+        if [ -d "build-artifacts/.m2/repository/com/seaweedfs" ]; then
+          cp -r build-artifacts/.m2/repository/com/seaweedfs ~/.m2/repository/com/
           echo "✓ Maven artifacts restored"
         else
           echo "⚠️ Warning: Maven artifacts not found in download"
-          ls -la
+          ls -la build-artifacts/
         fi
 
     - name: Prepare SeaweedFS binary
       run: |
-        echo "Making SeaweedFS binary executable..."
+        echo "Copying SeaweedFS binary to docker directory..."
+        cp build-artifacts/docker/weed docker/
         chmod +x docker/weed
         ls -la docker/weed
         echo "✓ Binary is ready"