Skip to content

Commit

Permalink
Fmt and Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Tjemmmic committed Aug 22, 2024
1 parent bbf4fdc commit 420b739
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 19 deletions.
25 changes: 19 additions & 6 deletions .github/workflows/validate_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ env:
RUST_BACKTRACE: full
RUST_LOG: "info"
CARGO_TERM_COLOR: always
CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG: true

jobs:
formatting:
Expand All @@ -34,27 +35,39 @@ jobs:

linting:
timeout-minutes: 120
name: cargo clippy
name: Cargo Clippy
runs-on: macos-latest
strategy:
matrix:
package: [
eigensdk-rs
]
steps:
- name: checkout code
- name: Checkout Code
uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0

- name: Print current directory
- 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: Current Working Directory
run: pwd

- name: List files
- name: List Files in Current Working Directory
run: ls -al

- name: install rust
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand All @@ -68,7 +81,7 @@ jobs:

testing:
timeout-minutes: 90
name: cargo test
name: Cargo Test
if: false # temporarily disabled
runs-on: macos-14
strategy:
Expand Down
12 changes: 9 additions & 3 deletions avs/incredible-squaring-avs/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ fn main() {
panic!("Forge executable not found. Make sure Foundry is installed.");
}
path
},
}
Err(_) => panic!("Failed to locate `forge` executable. Make sure Foundry is installed."),
};

for dir in contract_dirs {
let full_path = root.join(dir).canonicalize().unwrap_or_else(|_| {
println!("Directory not found or inaccessible: {}", root.join(dir).display());
println!(
"Directory not found or inaccessible: {}",
root.join(dir).display()
);
root.join(dir)
});

Expand All @@ -45,7 +48,10 @@ fn main() {
panic!("Forge build failed for directory: {}", full_path.display());
}
} else {
println!("Directory not found or does not exist: {}", full_path.display());
println!(
"Directory not found or does not exist: {}",
full_path.display()
);
}
}
}
12 changes: 9 additions & 3 deletions avs/tangle-avs/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ fn main() {
panic!("Forge executable not found. Make sure Foundry is installed.");
}
path
},
}
Err(_) => panic!("Failed to locate `forge` executable. Make sure Foundry is installed."),
};

for dir in contract_dirs {
let full_path = root.join(dir).canonicalize().unwrap_or_else(|_| {
println!("Directory not found or inaccessible: {}", root.join(dir).display());
println!(
"Directory not found or inaccessible: {}",
root.join(dir).display()
);
root.join(dir)
});

Expand All @@ -45,7 +48,10 @@ fn main() {
panic!("Forge build failed for directory: {}", full_path.display());
}
} else {
println!("Directory not found or does not exist: {}", full_path.display());
println!(
"Directory not found or does not exist: {}",
full_path.display()
);
}
}
}
12 changes: 9 additions & 3 deletions contracts/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ fn main() {
panic!("Forge executable not found. Make sure Foundry is installed.");
}
path
},
}
Err(_) => panic!("Failed to locate `forge` executable. Make sure Foundry is installed."),
};

for dir in contract_dirs {
let full_path = root.join(dir).canonicalize().unwrap_or_else(|_| {
println!("Directory not found or inaccessible: {}", root.join(dir).display());
println!(
"Directory not found or inaccessible: {}",
root.join(dir).display()
);
root.join(dir)
});

Expand All @@ -44,7 +47,10 @@ fn main() {
panic!("Forge build failed for directory: {}", full_path.display());
}
} else {
println!("Directory not found or does not exist: {}", full_path.display());
println!(
"Directory not found or does not exist: {}",
full_path.display()
);
}
}
}
14 changes: 10 additions & 4 deletions test-utils/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,16 @@ fn main() {
panic!("Forge executable not found. Make sure Foundry is installed.");
}
path
},
}
Err(_) => panic!("Failed to locate `forge` executable. Make sure Foundry is installed."),
};

for dir in contract_dirs {
let full_path = root.join(dir).canonicalize().unwrap_or_else(|_| {
println!("Directory not found or inaccessible: {}", root.join(dir).display());
println!(
"Directory not found or inaccessible: {}",
root.join(dir).display()
);
root.join(dir)
});

Expand All @@ -45,7 +48,10 @@ fn main() {
panic!("Forge build failed for directory: {}", full_path.display());
}
} else {
println!("Directory not found or does not exist: {}", full_path.display());
println!(
"Directory not found or does not exist: {}",
full_path.display()
);
}
}
}
}

0 comments on commit 420b739

Please sign in to comment.