From cfcd2553fd9c314e743ea78c81118d8e9facc4b7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 21 Dec 2025 21:30:34 +0000
Subject: [PATCH] Fix ARM64 build: improve Docker command structure

- Combine QEMU setup steps with better error handling
- Set HOME=/tmp to avoid permission issues
- Use /tmp for venv to avoid workspace conflicts
- Fix path references in test commands to be relative
- Add set -e for fail-fast behavior

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
---
 scripts/nightly.yaml | 30 +++++++++++++++++-------------
 scripts/release.yml  | 30 +++++++++++++++++-------------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/scripts/nightly.yaml b/scripts/nightly.yaml
index 28f312710..c711f2d65 100644
--- a/scripts/nightly.yaml
+++ b/scripts/nightly.yaml
@@ -174,24 +174,28 @@ stages:
       vmImage: "ubuntu-latest"
     steps:
     - script: |
+        set -e
         sudo apt-get update
         sudo apt-get install -y qemu-user-static
-      displayName: "Install QEMU for ARM64 emulation"
-    - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      displayName: "Register QEMU"
+        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      displayName: "Setup QEMU for ARM64 emulation"
     - script: |
+        set -e
         docker run --rm -v $(pwd):/workspace -w /workspace \
+          -e HOME=/tmp \
           quay.io/pypa/manylinux2014_aarch64:latest \
-          bash -c "/opt/python/cp38-cp38/bin/python -m venv /workspace/env && \
-                   source /workspace/env/bin/activate && \
-                   pip install build git+https://github.com/rhelmot/auditwheel && \
-                   cd src/api/python && \
-                   python -m build && \
-                   AUDITWHEEL_PLAT= auditwheel repair --best-plat dist/*.whl && \
-                   cd ../../.. && \
-                   pip install ./src/api/python/wheelhouse/*.whl && \
-                   python - <src/api/python/z3test.py z3 && \
-                   python - <src/api/python/z3test.py z3num"
+          bash -c "
+            set -e
+            /opt/python/cp38-cp38/bin/python -m venv /tmp/env
+            source /tmp/env/bin/activate
+            pip install build git+https://github.com/rhelmot/auditwheel
+            cd /workspace/src/api/python
+            python -m build
+            AUDITWHEEL_PLAT= auditwheel repair --best-plat dist/*.whl
+            pip install wheelhouse/*.whl
+            python - <z3test.py z3
+            python - <z3test.py z3num
+          "
       displayName: "Build and test ARM64 wheel"
     - task: CopyFiles@2
       inputs:
diff --git a/scripts/release.yml b/scripts/release.yml
index 84a66b349..4d770065c 100644
--- a/scripts/release.yml
+++ b/scripts/release.yml
@@ -178,24 +178,28 @@ stages:
       vmImage: "ubuntu-latest"
     steps:
     - script: |
+        set -e
         sudo apt-get update
         sudo apt-get install -y qemu-user-static
-      displayName: "Install QEMU for ARM64 emulation"
-    - script: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      displayName: "Register QEMU"
+        docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+      displayName: "Setup QEMU for ARM64 emulation"
     - script: |
+        set -e
         docker run --rm -v $(pwd):/workspace -w /workspace \
+          -e HOME=/tmp \
           quay.io/pypa/manylinux2014_aarch64:latest \
-          bash -c "/opt/python/cp38-cp38/bin/python -m venv /workspace/env && \
-                   source /workspace/env/bin/activate && \
-                   pip install build git+https://github.com/rhelmot/auditwheel && \
-                   cd src/api/python && \
-                   python -m build && \
-                   AUDITWHEEL_PLAT= auditwheel repair --best-plat dist/*.whl && \
-                   cd ../../.. && \
-                   pip install ./src/api/python/wheelhouse/*.whl && \
-                   python - <src/api/python/z3test.py z3 && \
-                   python - <src/api/python/z3test.py z3num"
+          bash -c "
+            set -e
+            /opt/python/cp38-cp38/bin/python -m venv /tmp/env
+            source /tmp/env/bin/activate
+            pip install build git+https://github.com/rhelmot/auditwheel
+            cd /workspace/src/api/python
+            python -m build
+            AUDITWHEEL_PLAT= auditwheel repair --best-plat dist/*.whl
+            pip install wheelhouse/*.whl
+            python - <z3test.py z3
+            python - <z3test.py z3num
+          "
       displayName: "Build and test ARM64 wheel"
     - task: CopyFiles@2
       inputs: