mirror of
https://github.com/maplibre/martin.git
synced 2024-12-29 01:43:46 +03:00
Fix a few CI issues and bump deps (#1341)
This commit is contained in:
parent
3031e104f9
commit
df8880fe4c
2
.github/workflows/build-deploy-docs.yml
vendored
2
.github/workflows/build-deploy-docs.yml
vendored
@ -32,7 +32,7 @@ jobs:
|
||||
- name: Setup mdBook
|
||||
uses: peaceiris/actions-mdbook@v2
|
||||
with:
|
||||
mdbook-version: 'latest'
|
||||
mdbook-version: '0.4.40'
|
||||
|
||||
- run: mdbook build docs
|
||||
|
||||
|
428
Cargo.lock
generated
428
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -33,7 +33,7 @@ anyhow = "1.0"
|
||||
approx = "0.5.1"
|
||||
async-trait = "0.1"
|
||||
bit-set = "0.5.3"
|
||||
brotli = "5.0.0"
|
||||
brotli = ">=5, <7"
|
||||
cargo-husky = { version = "1", features = ["user-hooks"], default-features = false }
|
||||
clap = { version = "4", features = ["derive"] }
|
||||
criterion = { version = "0.5", features = ["async_futures", "async_tokio", "html_reports"] }
|
||||
@ -45,8 +45,8 @@ flate2 = "1"
|
||||
futures = "0.3"
|
||||
indoc = "2"
|
||||
insta = "1"
|
||||
itertools = "0.12"
|
||||
json-patch = "1.2"
|
||||
itertools = "0.13"
|
||||
json-patch = "2.0"
|
||||
lambda-web = { version = "0.2.1", features = ["actix4"] }
|
||||
libsqlite3-sys = { version = ">=0.27", features = ["bundled"] }
|
||||
log = "0.4"
|
||||
@ -55,7 +55,7 @@ mbtiles = { path = "./mbtiles", version = "0.9.0" }
|
||||
moka = { version = "0.12", features = ["future"] }
|
||||
num_cpus = "1"
|
||||
pbf_font_tools = { version = "2.5.1", features = ["freetype"] }
|
||||
pmtiles = { version = "0.9", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots"] }
|
||||
pmtiles = { version = "0.10", features = ["http-async", "mmap-async-tokio", "tilejson", "reqwest-rustls-tls-native-roots"] }
|
||||
postgis = "0.9"
|
||||
postgres = { version = "0.19", features = ["with-time-0_3", "with-uuid-1", "with-serde_json-1"] }
|
||||
postgres-protocol = "0.6"
|
||||
|
@ -119,7 +119,7 @@ impl PgArgs {
|
||||
info!("Overriding root certificate file to {} on all Postgres connections because of a CLI parameter",
|
||||
value.display());
|
||||
pg_config.iter_mut().for_each(|c| {
|
||||
c.ssl_certificates.ssl_root_cert = ca_root_file.clone();
|
||||
c.ssl_certificates.ssl_root_cert.clone_from(&ca_root_file);
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -3,6 +3,7 @@ use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::srv::{SrvConfig, KEEP_ALIVE_DEFAULT, LISTEN_ADDRESSES_DEFAULT};
|
||||
|
||||
#[allow(clippy::doc_markdown)]
|
||||
#[derive(clap::Args, Debug, PartialEq, Default)]
|
||||
#[command(about, version)]
|
||||
pub struct SrvArgs {
|
||||
|
@ -8,11 +8,11 @@ pub const NO_MAIN_CACHE: OptMainCache = None;
|
||||
|
||||
#[derive(Debug, Hash, PartialEq, Eq)]
|
||||
pub enum CacheKey {
|
||||
/// (pmtiles_id, offset)
|
||||
/// (`pmtiles_id`, `offset`)
|
||||
PmtDirectory(usize, usize),
|
||||
/// (source_id, xyz)
|
||||
/// (`source_id`, `xyz`)
|
||||
Tile(String, TileCoord),
|
||||
/// (source_id, xyz, url_query)
|
||||
/// (`source_id`, `xyz`, `url_query`)
|
||||
TileWithQuery(String, TileCoord, String),
|
||||
}
|
||||
|
||||
|
@ -58,6 +58,8 @@ impl IdResolver {
|
||||
e.insert(unique_name);
|
||||
return id;
|
||||
}
|
||||
// Rust v1.78 - possibly due to bug fixed in https://github.com/rust-lang/rust-clippy/pull/12756
|
||||
#[allow(unknown_lints, clippy::assigning_clones)]
|
||||
Entry::Occupied(e) => {
|
||||
name = e.key().clone();
|
||||
if e.get() == &unique_name {
|
||||
|
@ -23,6 +23,7 @@ pub struct Args {
|
||||
command: Commands,
|
||||
}
|
||||
|
||||
#[allow(clippy::doc_markdown)]
|
||||
#[derive(Subcommand, PartialEq, Debug)]
|
||||
enum Commands {
|
||||
/// Show MBTiles file summary statistics
|
||||
@ -92,6 +93,7 @@ enum Commands {
|
||||
},
|
||||
}
|
||||
|
||||
#[allow(clippy::doc_markdown)]
|
||||
#[derive(Clone, Default, PartialEq, Debug, clap::Args)]
|
||||
pub struct CopyArgs {
|
||||
/// MBTiles file to read from
|
||||
@ -112,6 +114,7 @@ pub struct CopyArgs {
|
||||
apply_patch: Option<PathBuf>,
|
||||
}
|
||||
|
||||
#[allow(clippy::doc_markdown)]
|
||||
#[derive(Clone, Default, PartialEq, Debug, clap::Args)]
|
||||
pub struct DiffArgs {
|
||||
/// First MBTiles file to compare
|
||||
@ -125,6 +128,7 @@ pub struct DiffArgs {
|
||||
pub options: SharedCopyOpts,
|
||||
}
|
||||
|
||||
#[allow(clippy::doc_markdown)]
|
||||
#[derive(Clone, Default, PartialEq, Debug, clap::Args)]
|
||||
pub struct SharedCopyOpts {
|
||||
/// Limit what gets copied.
|
||||
|
@ -42,9 +42,9 @@ impl CopyDuplicateMode {
|
||||
|
||||
#[derive(Clone, Default, PartialEq, Debug)]
|
||||
pub struct MbtilesCopier {
|
||||
/// MBTiles file to read from
|
||||
/// `MBTiles` file to read from
|
||||
pub src_file: PathBuf,
|
||||
/// MBTiles file to write to
|
||||
/// `MBTiles` file to write to
|
||||
pub dst_file: PathBuf,
|
||||
/// Limit what gets copied
|
||||
pub copy: CopyType,
|
||||
|
Loading…
Reference in New Issue
Block a user