From 3f3511f6e13bf23beea54dc1f3076f34b06f192c Mon Sep 17 00:00:00 2001
From: Vincent Jacques <vincent@vincent-jacques.net>
Date: Wed, 4 Dec 2024 10:32:52 +0100
Subject: [PATCH] Investigate (2)

---
 .github/workflows/build-test-gha-branches.yml | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-test-gha-branches.yml b/.github/workflows/build-test-gha-branches.yml
index 8e5877c5..efbb8ed6 100644
--- a/.github/workflows/build-test-gha-branches.yml
+++ b/.github/workflows/build-test-gha-branches.yml
@@ -137,19 +137,24 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: source-dist
+          path: wd
 
       - name: Build the wheel, make it machine-independent and check it (during a Docker build in Qemu)
         run: |
-          docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load . --file .github/workflows/linux-arm64/build.Dockerfile
-          image=$(docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load . --file .github/workflows/linux-arm64/build.Dockerfile --quiet)
+          cp .github/workflows/linux-arm64/build.Dockerfile wd/Dockerfile
+          cd wd
+          find -type f
+          docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load .
+          image=$(docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load . --quiet)
           container=$(docker create --platform linux/arm64 $image)
           docker cp $container:/wd/dist .
+          find -type f
 
       - name: Upload the wheel to GitHub Actions artifacts
         uses: actions/upload-artifact@v4
         with:
           name: wheel-dist-${{ matrix.python_version }}-linux-arm64
-          path: dist
+          path: wd/dist
 
   check-on-linux-arm64:
     runs-on: ubuntu-24.04
@@ -175,12 +180,15 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: wheel-dist-${{ matrix.python_version }}-linux-arm64
-          path: dist
+          path: wd
 
       - name: Install the wheel and run it (during a Docker build in Qemu)
         run: |
+          cp .github/workflows/linux-arm64/check.Dockerfile wd/Dockerfile
+          cd wd
           find . -type f
-          docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load . --file .github/workflows/linux-arm64/check.Dockerfile
-          image=$(docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load . --file .github/workflows/linux-arm64/check.Dockerfile --quiet)
+          docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load .
+          image=$(docker buildx build --platform linux/arm64 --build-arg PYTHON_VERSION=${{ matrix.python_version }} --load . --quiet)
           container=$(docker create --platform linux/arm64 $image)
           docker cp $container:/output.txt - | tar --extract --to-stdout
+          find . -type f