WIP

.cirrus.yml

@@ -50,21 +50,17 @@ cat_logs_snippet: &CAT_LOGS
       - env
 
 linux_arm64_container_snippet: &LINUX_ARM64_CONTAINER
-  dockerfile: ci/linux-debian.Dockerfile
-  # Reduce number of CPUs to be able to do more builds in parallel.
-  cpu: 1
-  # Gives us more CPUs for free if they're available.
-  greedy: true
-  # More than enough for our scripts.
-  memory: 2G
+  test_script:
+    - env | tee /tmp/env
+    - DOCKER_BUILDKIT=1 docker build --file "ci/linux-debian.Dockerfile" --tag="ci_secp256k1_arm"
+    - docker image prune --force  # Cleanup stale layers
+    - docker run --rm --interactive --tty --mount "type=bind,src=./,dst=/ci_secp256k1" --env-file /tmp/env --name "ci_secp256k1_arm" "ci_secp256k1_arm" "/ci_secp256k1/ci/ci.sh"
 
 task:
   name: "ARM64: Linux (Debian stable)"
-  arm_container:
-    << : *LINUX_ARM64_CONTAINER
   persistent_worker:
     labels:
-      type: arm64  
+      type: arm64
   env:
     ECDH: yes
     RECOVERY: yes
@@ -73,17 +69,14 @@ task:
   matrix:
      # Currently only gcc-snapshot, the other compilers are tested on GHA with QEMU
      - env: { CC: 'gcc-snapshot' }
-  test_script:
-    - ./ci/ci.sh
+  << : *LINUX_ARM64_CONTAINER
   << : *CAT_LOGS
 
 task:
   name: "ARM64: Linux (Debian stable), Valgrind"
-  arm_container:
-    << : *LINUX_ARM64_CONTAINER
   persistent_worker:
     labels:
-      type: arm64  
+      type: arm64
   env:
     ECDH: yes
     RECOVERY: yes
@@ -96,6 +89,5 @@ task:
      - env: { CC: 'clang' }
      - env: { CC: 'gcc-snapshot' }
      - env: { CC: 'clang-snapshot' }
-  test_script:
-    - ./ci/ci.sh
+  << : *LINUX_ARM64_CONTAINER
   << : *CAT_LOGS