Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
g-r-a-n-t committed Mar 10, 2022
1 parent 3633870 commit ec85aa2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/expensive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
uses: Swatinem/rust-cache@v1

- name: Build
run: cargo test --workspace --all-features --no-run --locked -- --ignored
run: cargo test --workspace --features solc-backend --no-run --locked -- --ignored
- name: Run expensive tests
id: expensive_tests
run: cargo test --workspace --all-features --verbose -- --ignored
run: cargo test --workspace --features solc-backend --verbose -- --ignored
- name: Report
if: failure() && steps.expensive_tests.outcome == 'failure'
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ jobs:
- name: Cache Dependencies
uses: Swatinem/rust-cache@v1
- name: Build
run: cargo test --workspace --all-features --no-run --locked
run: cargo test --workspace --features solc-backend --no-run --locked
- name: Run tests
run: cargo test --workspace --all-features --verbose
run: cargo test --workspace --features solc-backend --verbose

wasm-test:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
toolchain: stable
override: true
- name: Build
run: cargo build --all-features --release && strip target/release/fe && mv target/release/fe target/release/${{ matrix.BIN_FILE }}
run: cargo build --features solc-backend --release && strip target/release/fe && mv target/release/fe target/release/${{ matrix.BIN_FILE }}
- name: Release
uses: softprops/action-gh-release@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ docker-wasm-test:

.PHONY: coverage
coverage:
cargo tarpaulin --workspace --all-features --verbose --timeout 120 --exclude-files 'tests/*' --exclude-files 'main.rs' --out xml html -- --skip differential::
cargo tarpaulin --workspace --features solc-backend --verbose --timeout 120 --exclude-files 'tests/*' --exclude-files 'main.rs' --out xml html -- --skip differential::

.PHONY: clippy
clippy:
cargo clippy --workspace --all-targets --all-features -- -D warnings -A clippy::upper-case-acronyms -A clippy::large-enum-variant -W clippy::redundant_closure_for_method_calls
cargo clippy --workspace --all-targets --features solc-backend -- -D warnings -A clippy::upper-case-acronyms -A clippy::large-enum-variant -W clippy::redundant_closure_for_method_calls

.PHONY: rustfmt
rustfmt:
Expand Down
3 changes: 1 addition & 2 deletions crates/fv/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#![cfg(feature = "kevm-backend")]
use fe_yulgen::Db;
use std::path::Path;
use std::process::Command;
use std::{env, fs};

const SPECS_DIR: &str = "tests/specs/fe/";

#[cfg(feature = "kevm-backend")]
pub fn kevm_path() -> String {
env::var("KEVM_PATH").expect("`KEVM_PATH` not set")
}

#[cfg(feature = "kevm-backend")]
pub fn run_spec(name: &str, src_path: &str, src: &str, spec: &str) -> Result<(), String> {
let kevm_path = kevm_path();

Expand Down

0 comments on commit ec85aa2

Please sign in to comment.