From de71bbc410f6b98690f4abfa8962b9b602cdf993 Mon Sep 17 00:00:00 2001
From: xavikh <xavikh@gmail.com>
Date: Mon, 10 Feb 2025 20:18:12 +0100
Subject: [PATCH] Update actions

---
 .github/workflows/test.yml | 78 +++++++++++++++++++++++++++++---------
 package.json               |  6 ++-
 2 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9a6b3c7..d0ee59d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,11 @@
-name: CI
+name: Tests
 
 on:
   push:
+    branches:
+      - 'main'
+      - 'develop'
+      - 'deploy/**'
   pull_request:
   workflow_dispatch:
 
@@ -9,32 +13,70 @@ env:
   FOUNDRY_PROFILE: ci
 
 jobs:
-  check:
+  test-upgrades:
     strategy:
       fail-fast: true
+    name: Test upgrades
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - uses: oven-sh/setup-bun@v2
+
+      - name: foundry-toolchain
+        uses: foundry-rs/foundry-toolchain@v1.3.1
 
-    name: Foundry project
+      - name: Show Forge version
+        run: forge --version
+
+      - name: Build
+        run: bun run build-all
+
+      - name: Run tests
+        run: bun run test-upgrades
+  test-fork:
+    strategy:
+      fail-fast: true
+    name: Test fork
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
+      - uses: oven-sh/setup-bun@v2
+
+      - name: foundry-toolchain
+        uses: foundry-rs/foundry-toolchain@v1.3.1
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+      - name: Show Forge version
+        run: forge --version
+
+      - name: Build
+        run: bun run build
+
+      - name: Run tests
+        run: bun run test-fork
+  test-unit:
+    strategy:
+      fail-fast: true
+    name: Test unit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
         with:
-          version: nightly
+          submodules: recursive
+      - uses: oven-sh/setup-bun@v2
+
+      - name: foundry-toolchain
+        uses: foundry-rs/foundry-toolchain@v1.3.1
 
       - name: Show Forge version
-        run: |
-          forge --version
-
-      - name: Run Forge build
-        run: |
-          forge build --sizes
-        id: build
-
-      - name: Run Forge tests
-        run: |
-          forge test --no-match-path "test/fork/**/*.sol" -vvv
-        id: test
+        run: forge --version
+
+      - name: Build
+        run: bun run build
+
+      - name: Run tests
+        run: bun run test-unit
+  
\ No newline at end of file
diff --git a/package.json b/package.json
index 4f1cb40..2fff3cd 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,10 @@
     "build": "forge build",
     "build-clean": "forge build --force",
     "build-refs": "bash script/build-reference-builds.sh",
-    "build-all": "bun run build-refs && bun run build-clean"
+    "build-all": "bun run build-refs && bun run build-clean",
+    "test-unit": "forge test --no-match-path \"{test/fork/*.sol,test/upgrades/*.sol}\" -vvv",
+    "test-fork": "forge test --match-path \"test/fork/**/*.sol\" -vvv",
+    "test-upgrades": "forge test --match-path \"test/upgrades/**/*.sol\" -vvv",
+    "test": "forge test -vvv"
   }
 }