Merge branch 'main' into paige-williams-create-base-from-ui

maplibre · Jul 12, 2024 · 2078b77 · 2078b77
2 parents 327e6b9 + adb9a4a
commit 2078b77
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 49 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -143,10 +143,7 @@ jobs:
             echo -e "\n----------------------------------------------"
             echo "Building $target"
             export "CARGO_TARGET_$(echo $target | tr 'a-z-' 'A-Z_')_RUSTFLAGS"='-C strip=debuginfo'
-            cross build --release --target $target --package mbtiles
-            cross build --release --target $target --package martin
-            # cross build --release --target $target --package martin-cp
-            # cross build --release --target $target --package mbtiles
+            cross build --release --target $target --workspace
             mkdir -p target_releases/$target
             mv target/$target/release/martin target_releases/$target
             mv target/$target/release/martin-cp target_releases/$target

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/src/config-file.md b/docs/src/config-file.md
@@ -26,7 +26,6 @@ keep_alive: 75
 # The socket address to bind [default: 0.0.0.0:3000]
 listen_addresses: '0.0.0.0:3000'
 
-
 # Set TileJSON URL path prefix, ignoring X-Rewrite-URL header. Must begin with a `/`
 base_path: /tiles
 

diff --git a/mbtiles/src/bindiff.rs b/mbtiles/src/bindiff.rs
@@ -133,7 +133,9 @@ fn start_processor_threads<S: Send + 'static, T: Send + 'static, P: BinDiffer<S,
     tx_ins: Sender<T>,
     has_errors: Arc<AtomicBool>,
 ) {
-    (0..num_cpus::get()).for_each(|_| {
+    let cpus = num_cpus::get();
+    info!("Processing bindiff patches using {cpus} threads...");
+    (0..cpus).for_each(|_| {
         let rx_wrk = rx_wrk.clone();
         let tx_ins = tx_ins.clone();
         let has_errors = has_errors.clone();

diff --git a/tests/test.sh b/tests/test.sh
@@ -470,11 +470,15 @@ if [[ "$MBTILES_BIN" != "-" ]]; then
     "$TEST_TEMP_DIR/world_cities_bindiff.mbtiles" \
     --patch-type bin-diff-gz \
     2>&1 | tee "$TEST_OUT_DIR/copy_bindiff.txt"
+  test_log_has_str "$TEST_OUT_DIR/copy_bindiff.txt" '.*Processing bindiff patches using .* threads...'
+
   $MBTILES_BIN copy \
     ./tests/fixtures/mbtiles/world_cities.mbtiles \
     --apply-patch "$TEST_TEMP_DIR/world_cities_bindiff.mbtiles" \
     "$TEST_TEMP_DIR/world_cities_modified2.mbtiles" \
     2>&1 | tee "$TEST_OUT_DIR/copy_bindiff2.txt"
+  test_log_has_str "$TEST_OUT_DIR/copy_bindiff2.txt" '.*Processing bindiff patches using .* threads...'
+
   # Ensure that world_cities_modified and world_cities_modified2 are identical (regular diff is empty)
   $MBTILES_BIN copy \
     ./tests/fixtures/mbtiles/world_cities_modified.mbtiles \