From 27edf0f8a9257918e48182116b203d2c8bf8e009 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt@mmmccormick.com>
Date: Tue, 18 Feb 2025 17:18:11 -0500
Subject: [PATCH] ci: improve multiarch base load

---
 .github/workflows/main.yml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 646d90c..399a21c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -83,7 +83,7 @@ jobs:
       - name: archive base
         run: |
           mkdir -p cache
-          docker export dockcross/base:latest-${{ env.HOST_ARCH }} | xz -e9 -T0 > ./cache/base.tar.xz
+          docker export dockcross/base:latest-${{ env.HOST_ARCH }} | xz -e9 -T0 > ./cache/base-multiarch.tar.xz
 
       - name: save base
         uses: actions/upload-artifact@v4
@@ -1318,6 +1318,10 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
+      - name: set host_arch
+        run: |
+          echo "HOST_ARCH=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')" >> $GITHUB_ENV
+
       - uses: actions/download-artifact@v4
         with:
           name: cache
@@ -1332,14 +1336,7 @@ jobs:
           path: ./cache
 
       - name: load multiarch base
-        run: xz -d -k < ./cache/base.tar.xz | docker import - dockcross/base:latest
-
-      - name: load base
-        run: xz -d -k < ./cache/base.tar.xz | docker import - dockcross/base:latest
-
-      - name: set host_arch
-        run: |
-          echo "HOST_ARCH=$(uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')" >> $GITHUB_ENV
+        run: xz -d -k < ./cache/base-multiarch.tar.xz | docker import - dockcross/base:latest-${{ env.HOST_ARCH }}
 
       - name: build
         env: