Build Script Fix

.github/workflows/validate_pr.yml

@@ -16,37 +16,6 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  forge:
-    name: Forge
-    runs-on: macos-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      - name: Install Foundry
-        run: |
-          curl -L https://foundry.paradigm.xyz | bash
-          source /Users/runner/.bashrc
-          foundryup
-
-      - name: Add Foundry to PATH
-        run: echo "${HOME}/.foundry/bin" >> $GITHUB_PATH
-
-      - name: Verify Forge installation
-        run: forge --version
-
-      - name: Run build script
-        run: |
-          chmod +x ./test-utils/scripts/build.sh
-          ./test-utils/scripts/build.sh
-
-      - name: Upload Build Artifacts
-        if: success()
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: ./out/
-
   formatting:
     name: Rustfmt
     runs-on: ubuntu-latest

avs/incredible-squaring-avs/build.rs

@@ -5,9 +5,10 @@ use std::process::Command;
 fn main() {
     // List of directories containing Solidity contracts
     let contract_dirs = vec![
-        "../../contracts",
-        "../../contracts/lib/eigenlayer-middleware",
-        "contracts",
+        "./../../contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts",
+        "./../../contracts/lib/eigenlayer-middleware",
+        "./../../contracts/",
+        "./contracts",
     ];
 
     // Get the project root directory
@@ -19,7 +20,7 @@ fn main() {
         if full_path.exists() {
             println!("cargo:rerun-if-changed={}", full_path.display());
 
-            let status = Command::new("/home/tjemmmic/.foundry/bin/forge")
+            let status = Command::new("forge")
                 .current_dir(&full_path)
                 .arg("build")
                 .status()

avs/tangle-avs/build.rs

@@ -5,9 +5,10 @@ use std::process::Command;
 fn main() {
     // List of directories containing Solidity contracts
     let contract_dirs = vec![
-        "../../contracts",
-        "../../contracts/lib/eigenlayer-middleware",
-        "contracts",
+        "./../../contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts",
+        "./../../contracts/lib/eigenlayer-middleware",
+        "./../../contracts/",
+        "./contracts",
     ];
 
     // Get the project root directory

contracts/build.rs

@@ -0,0 +1,35 @@
+use std::env;
+use std::path::Path;
+use std::process::Command;
+
+fn main() {
+    // List of directories containing Solidity contracts
+    let contract_dirs = vec![
+        "./lib/eigenlayer-middleware/lib/eigenlayer-contracts",
+        "./lib/eigenlayer-middleware",
+        "./",
+    ];
+
+    // Get the project root directory
+    let root = env::var("CARGO_MANIFEST_DIR").unwrap();
+
+    for dir in contract_dirs {
+        let full_path = Path::new(&root).join(dir).canonicalize().unwrap();
+
+        if full_path.exists() {
+            println!("cargo:rerun-if-changed={}", full_path.display());
+
+            let status = Command::new("forge")
+                .current_dir(&full_path)
+                .arg("build")
+                .status()
+                .expect("Failed to execute Forge build");
+
+            if !status.success() {
+                panic!("Forge build failed for directory: {}", full_path.display());
+            }
+        } else {
+            println!("Directory not found: {}", full_path.display());
+        }
+    }
+}

test-utils/build.rs

@@ -0,0 +1,37 @@
+use std::env;
+use std::path::Path;
+use std::process::Command;
+
+fn main() {
+    // List of directories containing Solidity contracts
+    let contract_dirs = vec![
+        "./../contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts",
+        "./../contracts/lib/eigenlayer-middleware",
+        "./../contracts/",
+        "./../avs/tangle-avs/contracts",
+        "./../avs/incredible-squaring-avs/contracts",
+    ];
+
+    // Get the project root directory
+    let root = env::var("CARGO_MANIFEST_DIR").unwrap();
+
+    for dir in contract_dirs {
+        let full_path = Path::new(&root).join(dir).canonicalize().unwrap();
+
+        if full_path.exists() {
+            println!("cargo:rerun-if-changed={}", full_path.display());
+
+            let status = Command::new("forge")
+                .current_dir(&full_path)
+                .arg("build")
+                .status()
+                .expect("Failed to execute Forge build");
+
+            if !status.success() {
+                panic!("Forge build failed for directory: {}", full_path.display());
+            }
+        } else {
+            println!("Directory not found: {}", full_path.display());
+        }
+    }
+}

test-utils/scripts/clean.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Define the directories
+DIR0="./contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts"
+DIR1="./contracts/lib/eigenlayer-middleware"
+DIR2="./contracts"
+DIR3="./avs/incredible-squaring-avs/contracts"
+DIR4="./avs/tangle-avs/contracts"
+
+# Function to run forge commands in a directory
+run_forge_commands() {
+    local dir=$1
+    echo "Running forge commands in $dir"
+    cd "$dir" || exit
+    forge clean
+    cd - || exit
+}
+
+# Run forge commands in all listed directories
+run_forge_commands "$DIR0"
+run_forge_commands "$DIR1"
+run_forge_commands "$DIR2"
+run_forge_commands "$DIR3"
+run_forge_commands "$DIR4"