Browse Source

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
pull/7526/head
chrislu 7 days ago
parent
commit
f3d9aa47ab
  1. 22
      .github/workflows/spark-integration-tests.yml

22
.github/workflows/spark-integration-tests.yml

@ -111,23 +111,24 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: seaweedfs-build name: seaweedfs-build
path: .
path: build-artifacts
- name: Restore Maven repository - name: Restore Maven repository
run: | run: |
echo "Restoring Maven artifacts to ~/.m2/repository..." echo "Restoring Maven artifacts to ~/.m2/repository..."
mkdir -p ~/.m2/repository/com 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" echo "✓ Maven artifacts restored"
else else
echo "⚠️ Warning: Maven artifacts not found in download" echo "⚠️ Warning: Maven artifacts not found in download"
ls -la
ls -la build-artifacts/
fi fi
- name: Prepare SeaweedFS binary - name: Prepare SeaweedFS binary
run: | run: |
echo "Making SeaweedFS binary executable..."
echo "Copying SeaweedFS binary to docker directory..."
cp build-artifacts/docker/weed docker/
chmod +x docker/weed chmod +x docker/weed
ls -la docker/weed ls -la docker/weed
echo "✓ Binary is ready" echo "✓ Binary is ready"
@ -237,23 +238,24 @@ jobs:
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: seaweedfs-build name: seaweedfs-build
path: .
path: build-artifacts
- name: Restore Maven repository - name: Restore Maven repository
run: | run: |
echo "Restoring Maven artifacts to ~/.m2/repository..." echo "Restoring Maven artifacts to ~/.m2/repository..."
mkdir -p ~/.m2/repository/com 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" echo "✓ Maven artifacts restored"
else else
echo "⚠️ Warning: Maven artifacts not found in download" echo "⚠️ Warning: Maven artifacts not found in download"
ls -la
ls -la build-artifacts/
fi fi
- name: Prepare SeaweedFS binary - name: Prepare SeaweedFS binary
run: | run: |
echo "Making SeaweedFS binary executable..."
echo "Copying SeaweedFS binary to docker directory..."
cp build-artifacts/docker/weed docker/
chmod +x docker/weed chmod +x docker/weed
ls -la docker/weed ls -la docker/weed
echo "✓ Binary is ready" echo "✓ Binary is ready"

Loading…
Cancel
Save