Skip to content

Commit 481a892

Browse files
committed
use only ARM caches for final build
1 parent 65f325e commit 481a892

File tree

1 file changed

+2
-40
lines changed

1 file changed

+2
-40
lines changed

.github/workflows/buildService.yml

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -490,35 +490,16 @@ jobs:
490490
restore-keys: |
491491
${{ runner.os }}-X64-node-modules-
492492
493-
- name: Restore Rust build artifacts (from Intel build)
494-
if: hashFiles('**/Cargo.lock') != ''
495-
uses: actions/cache/restore@v4
496-
with:
497-
path: |
498-
target/
499-
~/.cargo/registry/
500-
~/.cargo/git/
501-
key: ${{ runner.os }}-X64-rust-${{ hashFiles('**/Cargo.lock') }}-v1
502-
restore-keys: |
503-
${{ runner.os }}-X64-rust-
504-
505493
- name: Download Docker cache from ARM
506494
uses: actions/download-artifact@v4
507495
continue-on-error: true
508496
with:
509497
name: docker-cache-arm
510498
path: docker-cache-arm/
511499

512-
- name: Download Docker cache from Intel
513-
uses: actions/download-artifact@v4
514-
continue-on-error: true
515-
with:
516-
name: docker-cache-intel
517-
path: docker-cache-intel/
518-
519500
- name: Import Docker images from both architectures
520501
run: |
521-
echo "📦 Importing Docker images from both ARM and Intel builds..."
502+
echo "📦 Importing Docker images from ARM build..."
522503
echo " Build type: ${{ needs.BuildARM.outputs.build_type }}"
523504
524505
imported_count=0
@@ -541,26 +522,7 @@ jobs:
541522
else
542523
echo "No ARM Docker cache found"
543524
fi
544-
545-
# Import Intel cache
546-
if [ -d "docker-cache-intel" ] && [ -n "$(ls -A docker-cache-intel/*.tar 2>/dev/null)" ]; then
547-
echo "Loading Intel Docker cache..."
548-
for tar_file in docker-cache-intel/*.tar; do
549-
if [ -f "$tar_file" ]; then
550-
image_name=$(basename "$tar_file" .tar)
551-
echo " Loading: $image_name"
552-
if docker load -i "$tar_file" 2>/dev/null; then
553-
echo " ✅ Loaded: $image_name (or already exists)"
554-
imported_count=$((imported_count + 1))
555-
else
556-
echo " ❌ Failed: $image_name"
557-
fi
558-
fi
559-
done
560-
else
561-
echo "No Intel Docker cache found"
562-
fi
563-
525+
564526
echo "=== IMPORT SUMMARY ==="
565527
echo "📊 Imported $imported_count image archive(s)"
566528
echo "🐳 Available Docker images after import:"

0 commit comments

Comments
 (0)