diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17d6406..29ac747 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,16 @@ jobs: git clone https://github.com/ohsu-comp-bio/funnel.git cd funnel && make && make install && cd .. - uses: actions/checkout@v2 # checkout the repository + - name: Lint + run: | + . $HOME/.cargo/env + cargo clippy -- -D warnings + - name: Format + run: | + . $HOME/.cargo/env + # rustup install nightly + # rustup default nightly + cargo fmt -- --check # --config-path ./rustfmt.toml - name: Build models run: | . $HOME/.cargo/env @@ -102,11 +112,4 @@ jobs: run: | . $HOME/.cargo/env bash ./run-tests.sh - - name: Lint - run: | - . $HOME/.cargo/env - cargo clippy -- -D warnings - - name: Format - run: | - . $HOME/.cargo/env - cargo fmt \ No newline at end of file + diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..62437b6 --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,4 @@ +ignore = [ + "lib/serviceinfo/models", + "lib/tes/models", +] \ No newline at end of file