diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml index fa02b24b1..4801a8a78 100644 --- a/.github/workflows/code-quality.yaml +++ b/.github/workflows/code-quality.yaml @@ -33,12 +33,13 @@ jobs: timeout-minutes: 60 steps: - uses: actions/checkout@v4 - - name: Install Rust toolchains + - name: Install Rust nightly toolchain with rustfmt uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly components: rustfmt - - uses: actions-rust-lang/setup-rust-toolchain@v1 + - name: Install Rust stable toolchain with clippy + uses: actions-rust-lang/setup-rust-toolchain@v1 with: components: clippy - uses: actions-rs/clippy-check@v1 @@ -48,9 +49,9 @@ jobs: uses: baptiste0928/cargo-install@v3 with: crate: taplo-cli + - name: Run Lint Checks (fmt, clippy, taplo) + run: make lint - name: Spell Check with Typos uses: crate-ci/typos@master with: config: ./.github/typos.toml - - name: Run make lint - run: make lint diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index c7a87a67a..9cad71814 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -49,29 +49,17 @@ jobs: - name: Run cargo hack run: make check-features - doc_all_features: + check-docs: + name: Check Documentations runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: stable - - uses: actions-rs/cargo@v1 - with: - command: doc - args: --all-features --release - - doc_no_default_features: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions-rust-lang/setup-rust-toolchain@v1 - with: - toolchain: stable - - uses: actions-rs/cargo@v1 - with: - command: doc - args: --no-default-features --release + components: rust-docs + - name: Run cargo docs + run: make check-docs test-stable: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 74c13774d..98974febe 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@ lint: ## Lint the code using rustfmt, clippy and whitespace lints. $(MAKE) clippy $(MAKE) lint-toml $(MAKE) -C ./cosmwasm lint $@ - typos --config $(CURDIR)/.github/typos.toml bash ./ci/code-quality/whitespace-lints.sh fmt: ## Format the code using nightly rustfmt. @@ -28,6 +27,9 @@ clippy: ## Lint the code using clippy. lint-toml: ## Lint the TOML files using taplo. taplo fmt --check +typos: ## Check for typos in the code. + typos --config $(CURDIR)/.github/typos.toml + check-features: ## Check that project compiles with all combinations of features. cargo hack check --workspace --feature-powerset --exclude-features default