From e1127a33387671c5d2b15684add24ef36533a887 Mon Sep 17 00:00:00 2001
From: James Zaki <james.zaki@proton.me>
Date: Wed, 2 Jul 2025 18:36:56 +0100
Subject: [PATCH 1/2] Add build+test to CI

---
 .github/workflows/ci.yml | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..cc0b34f
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  merge_group:
+    branches: [ jz/add-ci-test ]
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y build-essential
+          # Install aztec
+          NON_INTERACTIVE=1 bash -i <(curl -s https://install.aztec.network)
+          echo "$HOME/.aztec/bin" >> $GITHUB_PATH
+
+      - name: Build contract
+        run: |
+          cd hello
+          make
+
+      - name: Run tests
+        run: |
+          cd hello
+          aztec test

From 4c9268dfd41bac7fbcdf55f15896ef540104ed60 Mon Sep 17 00:00:00 2001
From: James Zaki <james.zaki@proton.me>
Date: Wed, 2 Jul 2025 19:08:34 +0100
Subject: [PATCH 2/2] CI: combine tests

---
 .github/workflows/{ci.yml => test-examples.yml} | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
 rename .github/workflows/{ci.yml => test-examples.yml} (68%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/test-examples.yml
similarity index 68%
rename from .github/workflows/ci.yml
rename to .github/workflows/test-examples.yml
index cc0b34f..41cc61e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/test-examples.yml
@@ -1,8 +1,6 @@
-name: CI
+name: Test examples
 
 on:
-  merge_group:
-    branches: [ jz/add-ci-test ]
   push:
     branches: [ main ]
   pull_request:
@@ -17,18 +15,12 @@ jobs:
 
       - name: Install dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential
           # Install aztec
           NON_INTERACTIVE=1 bash -i <(curl -s https://install.aztec.network)
           echo "$HOME/.aztec/bin" >> $GITHUB_PATH
 
-      - name: Build contract
+      - name: Build+Test Hello
         run: |
           cd hello
           make
-
-      - name: Run tests
-        run: |
-          cd hello
           aztec test