From c0cc61c0c0e4bedfcac7f052a22a5bb2fc19a360 Mon Sep 17 00:00:00 2001 From: Pete Gadomski Date: Mon, 23 Sep 2024 14:17:27 -0600 Subject: [PATCH] ci: use cargo-all-features --- .github/workflows/api.yml | 6 ------ .github/workflows/ci.yml | 4 ++-- .github/workflows/cli.yml | 14 +------------- .github/workflows/core.yml | 17 ++--------------- .github/workflows/server.yml | 6 ------ core/Cargo.toml | 11 +++++++++++ 6 files changed, 16 insertions(+), 42 deletions(-) diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 18ef9607..27bee698 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -36,11 +36,5 @@ jobs: - uses: actions/checkout@v4 - name: Set up Rust cache uses: Swatinem/rust-cache@v2 - - name: Check - run: cargo check - - name: Check w/ geo - run: cargo check -F geo - - name: Check w/ client - run: cargo check -F client - name: Test run: cargo test --all-features diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92450e92..70ad5676 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,10 +37,10 @@ jobs: sudo apt-get install libgdal-dev - name: Fmt run: cargo fmt - - name: Check - run: cargo check --all --all-features - name: Clippy run: cargo clippy --all --all-features + - name: Check + run: cargo check-all-features check-nightly: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index 9973013e..2aaa9566 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -28,7 +28,6 @@ jobs: strategy: matrix: os: - - ubuntu-latest - macos-latest - windows-latest runs-on: ${{ matrix.os }} @@ -36,21 +35,10 @@ jobs: - uses: actions/checkout@v4 - name: Set up Rust cache uses: Swatinem/rust-cache@v2 - - name: Check w/ no default features - run: cargo check --no-default-features - - name: Check w/ pgstac - run: cargo check --no-default-features -F pgstac - - name: Check w/ python - run: cargo check --no-default-features -F python - name: Test run: cargo test --no-default-features -F pgstac -F python test-cli-with-gdal: runs-on: ubuntu-latest - strategy: - matrix: - args: - - "--no-default-features -F gdal" - - "" steps: - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 @@ -59,7 +47,7 @@ jobs: sudo apt-get update sudo apt-get install libgdal-dev - name: Test - run: cargo test ${{ matrix.args }} + run: cargo test --no-default-features -F gdal test-cli-with-duckdb: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index c07cb074..c1c35983 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -27,7 +27,6 @@ jobs: strategy: matrix: os: - - ubuntu-latest - macos-latest - windows-latest runs-on: ${{ matrix.os }} @@ -35,20 +34,8 @@ jobs: - uses: actions/checkout@v4 - name: Set up Rust cache uses: Swatinem/rust-cache@v2 - - name: Check - run: cargo check - - name: Check w/ geo - run: cargo check -F geo - - name: Check w/ geoarrow - run: cargo check -F geoarrow - - name: Check w/ geoparquet - run: cargo check -F geoparquet - - name: Check w/ object-store - run: cargo check -F object-store - - name: Check w/ reqwest - run: cargo check -F reqwest - name: Test - run: cargo test -F geo -F geoparquet-compression -F reqwest -F object-store-all + run: cargo test -F geo -F geoparquet-compression -F reqwest -F object-store-all -F validate-blocking test-core-with-gdal: runs-on: ubuntu-latest steps: @@ -59,4 +46,4 @@ jobs: sudo apt-get update sudo apt-get install libgdal-dev - name: Test - run: cargo test -F gdal + run: cargo test --all-features diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 7deca92a..c19feca6 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -36,11 +36,5 @@ jobs: - uses: actions/checkout@v4 - name: Set up Rust cache uses: Swatinem/rust-cache@v2 - - name: Check - run: cargo check - - name: Check - run: cargo check -F axum - - name: Check - run: cargo check -F pgstac - name: Test run: cargo test -F axum -F pgstac diff --git a/core/Cargo.toml b/core/Cargo.toml index 03bace07..d0a503db 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -78,3 +78,14 @@ tokio-test = "0.4" [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs"] + +[package.metadata.cargo-all-features] +max_combination_size = 2 +denylist = [ + "geoparquet-compression", + "object-store-all", + "object-store-aws", + "object-store-azure", + "object-store-gcp", + "object-store-http", +]