From cecb7bf16c0e599864187e1bb63cf899a9a44897 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Thu, 25 Jul 2024 20:29:52 +0800
Subject: [PATCH] CI python linux arm install

---
 .github/workflows/tests.yaml | 10 +++++++++-
 scripts/run-test-stack.sh    |  9 +++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e73721ce..c9ba22ea 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -51,7 +51,15 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: apt-get update && apt-get install -y jq
-      - name: Install Python
+      # At present the stock setup-python action fails on Linux/aarch64
+      # Conditional steps below workaroud this by using deadsnakes for that case only
+      - name: "Install Python for ARM on Linux"
+        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
+        uses: deadsnakes/action@v3.0.1
+        with:
+          python-version: 3.11
+      - name: "Install Python cases other than ARM on Linux"
+        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
         uses: actions/setup-python@v4
         with:
           python-version: 3.11
diff --git a/scripts/run-test-stack.sh b/scripts/run-test-stack.sh
index 6be1896e..3328b09d 100755
--- a/scripts/run-test-stack.sh
+++ b/scripts/run-test-stack.sh
@@ -1,21 +1,22 @@
 #!/bin/bash
 
-set -ex
+set -e
 
 stack_dir=$(readlink -f "$1")
 [[ -d "$stack_dir" ]]
 
+laconic_so="laconic-so --verbose --stack $stack_dir"
+
 CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
 # By default assume we are running in the project root.
 export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-$(git rev-parse --show-toplevel)/..}"
 
-laconic_so="laconic-so --verbose --stack $stack_dir"
-
 # Don't run geth/plugeth in the debugger, it will swallow error backtraces
 echo CERC_REMOTE_DEBUG=false >> $CONFIG_DIR/stack.env
 # Passing this lets us run eth_call forwarding tests without running ipld-eth-db
 echo CERC_RUN_STATEDIFF=${CERC_RUN_STATEDIFF:-true} >> $CONFIG_DIR/stack.env
 
+set -x
 
 if [[ -z $SKIP_BUILD ]]; then
   # Prevent conflicting tty output
@@ -35,7 +36,7 @@ fi
 
 set +x
 
-# Get IPv4 endpoint of geth file server
+# Get IPv4 endpoint of geth bootnode file server
 bootnode_endpoint=$(docker port test-fixturenet-eth-bootnode-geth-1 9898 | head -1)
 
 # Extract the chain config and ID from genesis file