Fix CI

Author: b4l

.github/workflows/ci.yml

@@ -2,11 +2,7 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
   pull_request:
-    branches:
-      - main
 
 env:
   CARGO_TERM_COLOR: always
@@ -17,17 +13,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
+      - name: Dependencies
+        run: sudo apt-get install -y build-essential pkg-config libclang-dev libgdal-dev
+      
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup
+        run: docker compose up db minio minio-mc -d
 
-      - name: Setup compose
-        run: docker compose up -d
+      - name: Build
+        run: rustup update stable && rustup default stable && cargo build --workspace --all-targets
 
       - name: Format
-        run: docker exec -i ogcapi cargo fmt --all -- --check
+        run: cargo fmt --all -- --check
 
       - name: Clippy
-        run: docker exec -i ogcapi cargo clippy --workspace --all-features --examples --tests -- -D warnings
+        run: cargo clippy --workspace --all-features --all-targets -- -D warnings
 
       - name: Test
-        run: docker exec -i ogcapi cargo test --workspace --all-features
+        run: cargo test --workspace --all-features --all-targets

ogcapi-drivers/src/lib.rs

@@ -18,9 +18,12 @@ use ogcapi_types::tiles::TileMatrixSet;
 #[cfg(feature = "features")]
 use ogcapi_types::{
     common::Crs,
-    features::{Feature, FeatureCollection, Query as FeatureQuery},
+    features::{Feature, Query as FeatureQuery},
 };
 
+#[cfg(any(feature = "features", feature = "stac", feature = "edr"))]
+use ogcapi_types::features::FeatureCollection;
+
 /// Trait for `Collection` transactions
 #[cfg(feature = "common")]
 #[async_trait::async_trait]

ogcapi-processes/src/geojson_loader.rs

@@ -236,7 +236,7 @@ mod tests {
         );
 
         let input = GeoJsonLoaderInputs {
-            input: "../data/data/ne_10m_railroads_north_america.geojson".to_owned(),
+            input: "../data/ne_10m_railroads_north_america.geojson".to_owned(),
             collection: "streets".to_string(),
             s_srs: None,
             database_url: "postgresql://postgres:password@localhost:5433/ogcapi".to_string(),

ogcapi-services/Cargo.toml

@@ -53,8 +53,8 @@ ogcapi-processes = { path = "../ogcapi-processes", version = "0.2", optional = t
 
 [dev-dependencies]
 geojson = { workspace = true }
-hyper-util = { version = "0.1.10", features = ["client"] }
+hyper-util = { version = "0.1.10", features = ["client-legacy"] }
 http-body-util = "0.1.2"
-uuid = { version = "1.11", features = ["serde", "v4"] }
+uuid = { version = "1.15.1", features = ["serde", "v4"] }
 
 data-loader = { path = "../examples/data-loader" }

ogcapi-types/Cargo.toml

@@ -13,7 +13,7 @@ default = ["common"]
 
 # standards
 common = []
-edr = ["common"]
+edr = ["common", "features"]
 features = ["common"]
 processes = ["common"]
 stac = ["features"]