From b5ed642e97d242bea6affce5c8efb4e99518a8f7 Mon Sep 17 00:00:00 2001
From: Karl Bartel <karl.bartel@clabs.co>
Date: Tue, 26 Sep 2023 17:08:05 +0200
Subject: [PATCH] circleci: Run e2e_test before unit tests

---
 .circleci/config.yml      |  8 ++++++++
 e2e_test/run_all_tests.sh | 16 ++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9080af54c5..bff7146a59 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,14 @@ jobs:
       - image: cimg/go:1.19
     steps:
       - checkout
+      - run:
+          command: |
+            curl -L https://foundry.paradigm.xyz | SHELL=/usr/bin/bash bash
+            ~/.foundry/bin/foundryup
+      - run:
+          command: make geth
+      - run:
+          command: PATH="~/.foundry/bin:${PATH}" e2e_test/run_all_tests.sh
       - run:
           command: go run build/ci.go test
   lint-geth:
diff --git a/e2e_test/run_all_tests.sh b/e2e_test/run_all_tests.sh
index 5b91d248c1..59413a8f1d 100755
--- a/e2e_test/run_all_tests.sh
+++ b/e2e_test/run_all_tests.sh
@@ -29,26 +29,26 @@ do
 	echo -e "\nRun $f"
 	if "./$f"
 	then
-		tput setaf 2
+		tput setaf 2 || true
 		echo "PASS $f"
 	else
-		tput setaf 1
+		tput setaf 1 || true
 		echo "FAIL $f ❌"
-		((failures++))
+		((failures++)) || true
 	fi
-	tput init
-	((tests++))
+	tput init || true
+	((tests++)) || true
 done
 
 ## Final summary
 echo
 if [[ $failures -eq 0 ]] 
 then
-	tput setaf 2
+	tput setaf 2 || true
 	echo All tests succeeded!
 else
-	tput setaf 1
+	tput setaf 1 || true
 	echo $failures/$tests failed.
 fi
-tput init
+tput init || true
 exit $failures