From bdc71287b4218a2a165552824e1f96cfb99cd878 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Thu, 8 Aug 2024 05:54:40 +0000 Subject: [PATCH 1/2] re-enable check-fmt in CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b20f59c6..958bb528a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,9 +46,9 @@ jobs: uses: ./.github/actions/setup-node - run: rustup component add rustfmt - run: make twoliter unit-tests - # TODO: fixme please! # Avoid running Go lint check via `cargo make check-lints` since there's a separate golangci-lint workflow - # - run: make twoliter check-fmt + - run: make twoliter check-fmt + # TODO: fixme please! # - run: make twoliter check-clippy - run: make twoliter check-shell - run: make ARCH="${{ matrix.arch }}" From 7e70ee190c475028786545a2d7f49e3943c6d3f4 Mon Sep 17 00:00:00 2001 From: "Sean P. Kelly" Date: Thu, 8 Aug 2024 06:14:27 +0000 Subject: [PATCH 2/2] re-enable check-licenses in CI --- .github/workflows/build.yml | 1 + sources/deny.toml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 958bb528a..33ef9d0dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,7 @@ jobs: - name: Preflight step to set up the runner uses: ./.github/actions/setup-node - run: rustup component add rustfmt + - run: make twoliter check-licenses - run: make twoliter unit-tests # Avoid running Go lint check via `cargo make check-lints` since there's a separate golangci-lint workflow - run: make twoliter check-fmt diff --git a/sources/deny.toml b/sources/deny.toml index 6133441aa..1d7175deb 100644 --- a/sources/deny.toml +++ b/sources/deny.toml @@ -55,6 +55,8 @@ deny = [{ name = "structopt" }, { name = "clap", wrappers = ["cargo-readme"] }] skip = [ # this can be removed once settings sdk is updated to base64 0.22.1 { name = "base64", version = "=0.21.7" }, + # this can be removed once settings sdk is updated to env_logger 0.11 + { name = "env_logger", version = "=0.10.2" }, ] skip-tree = [