This extracts some of the code from #511 but without breaking changes
* Use `PathBuf` instead of `String` where dealing with files
* Parse keep_alive as u64
* More config tests to crash if martin output contains warnings or
errors
Can now handle several additional Postgres functions to get a tile, plus
tons of small fixes
### Multiple result variants
* `getmvt(z,x,y) -> [bytea,md5]` (single row with two columns)
* `getmvt(z,x,y) -> [bytea]` (single row with a single column)
* `getmvt(z,x,y) -> bytea` (value)
### Multiple input parameter variants
* `getmvt(z, x, y)` or `getmvt(zoom, x, y)` (all 3 vars must be
integers)
* `getmvt(z, x, y, url_query)`, where instead of `url_query` it could be
any other name, but must be of type JSON
### Breaking
* srid is now the same type as PG -- `i32`
* renamed config vals `table_sources` and `function_sources` into
`tables` and `functions`
### Features and fixes
* if postgis is v3.1+, uses margin parameter to extend the search box by
the size of the buffer. I think we should make 3.1 minimal required.
* fixes feature ID issue from #466
* fixes mixed case names for schemas, tables and columns, functions and
parameter names per #389
### Notes
* More dynamic SQL generation in code instead of using external SQL
files. Those should only be used when they are not parametrized.
* The new function/table discovery mechanism: query for all functions in
the database, and match up those functions with the ones configured (if
any), plus adds all the rest of the un-declared ones if discovery mode
is on.
* During table and function discovery, the code generates a map of
`(PgSqlInfo, FunctionInfo)` (or table) tupples containing SQL needed to
get the tile.
* Auto-discovery mode is currently hidden - the discovery is on only
when no tables or functions are configured. TBD - how to configure it in
the future
* The new system allows for an easy way to auto-discover for the
specific schemas only, solving #47
* predictable order of table/function instantiation
* bounding boxes computed in parallel for all tables (when not
configured)
* proper identifier escaping
* test cleanup
fixes#378fixes#466fixes#65fixes#389
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.43
to 0.10.44.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="e0b937c48d"><code>e0b937c</code></a>
Release openssl v0.10.44</li>
<li><a
href="a1b82a2d83"><code>a1b82a2</code></a>
Release openssl-sys v0.9.79</li>
<li><a
href="54d4496e94"><code>54d4496</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1741">#1741</a>
from wiktor-k/improve-docs</li>
<li><a
href="6643d07213"><code>6643d07</code></a>
rustfmt</li>
<li><a
href="d299bbcf23"><code>d299bbc</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1740">#1740</a>
from alexanderjordanbaker/X509LoadCertFile</li>
<li><a
href="5ae938ee55"><code>5ae938e</code></a>
Add support for X509_load_cert_file</li>
<li><a
href="d390c414ec"><code>d390c41</code></a>
Add more elaborate ECDH example to <code>openssl::derive</code></li>
<li><a
href="9b851cdf76"><code>9b851cd</code></a>
Add documentation to several <code>openssl::ec</code> items</li>
<li><a
href="a6af54eee1"><code>a6af54e</code></a>
Move <code>openssl::hash</code> documentation to respective
functions</li>
<li><a
href="b42a2b7714"><code>b42a2b7</code></a>
Add documentation to <code>openssl::sign::Verifier</code></li>
<li>Additional commits viewable in <a
href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.43...openssl-v0.10.44">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* bump docker compose to use latest supported db and postgis
* update justfile to allow simple legacy testing
* update readme
Followup: implement CI testing -- see #502
* All tests and internal code now uses ST_TileEnvelope function
* Remove `tile_bbox`
* Rename test function sources for clarity - this will be needed in a
subsequent PR to add other function tests
Bumps [async-trait](https://github.com/dtolnay/async-trait) from 0.1.58
to 0.1.59.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/async-trait/releases">async-trait's
releases</a>.</em></p>
<blockquote>
<h2>0.1.59</h2>
<ul>
<li>Support <code>self: Arc<Self></code> async methods that have a
default implementation provided by the trait (<a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/210">#210</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="c1fba00e2e"><code>c1fba00</code></a>
Release 0.1.59</li>
<li><a
href="b0466bb302"><code>b0466bb</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/223">#223</a>
from dtolnay/arc</li>
<li><a
href="066f06ec0d"><code>066f06e</code></a>
Match specifically Arc<Self>, not any other Arc</li>
<li><a
href="d1a4a23e97"><code>d1a4a23</code></a>
Infer Sync+Send bound for Arc<Self> methods with default body</li>
<li><a
href="e5828bf9e1"><code>e5828bf</code></a>
Add regression test for issue 210</li>
<li><a
href="9ed6489ee0"><code>9ed6489</code></a>
Format with rustfmt 1.5.1-nightly</li>
<li><a
href="b100ace3bc"><code>b100ace</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/222">#222</a>
from dtolnay/bound</li>
<li><a
href="643c07c0d1"><code>643c07c</code></a>
Generalize support for inferred multiple bounds</li>
<li><a
href="6c13d6fb80"><code>6c13d6f</code></a>
Move absolute path of bound into InferredBound</li>
<li><a
href="cfa9c10f53"><code>cfa9c10</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/async-trait/issues/221">#221</a>
from dtolnay/bound</li>
<li>Additional commits viewable in <a
href="https://github.com/dtolnay/async-trait/compare/0.1.58...0.1.59">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Fix incorrect printing of the xyz value - implements Display trait
instead to keep it simpler
* Remove the possibly-incorrect macro capture of a simple string - in
case the string contains inline vars
* Handle optional extra comma properly
* Rename it to a shorter name
* Inline vars where possible
[//]: # (dependabot-start)
⚠️ **Dependabot is rebasing this PR** ⚠️
Rebasing might not happen immediately, so don't worry if this takes some
time.
Note: if you make any changes to this PR yourself, they will take
precedence over the rebase.
---
[//]: # (dependabot-end)
Bumps [env_logger](https://github.com/rust-cli/env_logger) from 0.9.3 to
0.10.0.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/rust-cli/env_logger/blob/main/CHANGELOG.md">env_logger's
changelog</a>.</em></p>
<blockquote>
<h2>[0.10.0] - 2022-11-24</h2>
<p>MSRV changed to 1.60 to hide optional dependencies</p>
<h3>Fixes</h3>
<ul>
<li>Resolved soundness issue by switching from <code>atty</code> to
<code>is-terminal</code></li>
</ul>
<h3>Breaking Changes</h3>
<p>To open room for changing dependencies:</p>
<ul>
<li>Renamed <code>termcolor</code> feature to <code>color</code></li>
<li>Renamed <code>atty</code> feature to <code>auto-color</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="ff029fa8b6"><code>ff029fa</code></a>
chore: Release</li>
<li><a
href="389cc52d5a"><code>389cc52</code></a>
docs: Fix changelog links</li>
<li><a
href="2979c4b7b8"><code>2979c4b</code></a>
docs: Update changelog</li>
<li><a
href="4c379170f7"><code>4c37917</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/rust-cli/env_logger/issues/248">#248</a>
from epage/atty</li>
<li><a
href="d55d26980f"><code>d55d269</code></a>
style: Make clippy happy</li>
<li><a
href="066c2192c1"><code>066c219</code></a>
fix: Replace atty with is_terminal</li>
<li><a
href="4db5e87931"><code>4db5e87</code></a>
fix!: Rename termcolor/atty features</li>
<li><a
href="660cf7feb2"><code>660cf7f</code></a>
fix: Bump MSRV to 1.60.0</li>
<li><a
href="e572d04872"><code>e572d04</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/rust-cli/env_logger/issues/244">#244</a>
from epage/update</li>
<li><a
href="f1ff331fa2"><code>f1ff331</code></a>
docs: Fix typos</li>
<li>Additional commits viewable in <a
href="https://github.com/rust-cli/env_logger/compare/v0.9.3...v0.10.0">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Partial implementation of the #430
* New endpoint structure:
* `GET /` -- a placeholder for the future home page
* `GET /catalog` -- get a list of available sources, as a list of json
blobs.
* `[{id, name, description, attribution, vector_layer}, ...]` (some
fields might be missing)
* `GET /<id>` -- get tilejson for the given source, or a combination of
sources. No `.json` extension
* `GET /<id>/<z>/<x>/<y>` -- get a tile. No format extension.
* `GET /health` -- healthcheck
* Introduce a new tile format support crate (using code from the
maplibre/mbtileserve project)
* Removed the `/rpc/...` routes - all source IDs are accessed in the
same way
* Can print auto-generated configuration or save it to a file
* Refactored to support multiple sources from multiple backends, with a
proper naming conflict resolution
TODO:
* benchmarks need to be rewritten - they were relying on some internal
structures that are no longer there. This might be done as a separate PR
due to a very different internal architecture - might need to rethink
benchmarking approaches.
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.26 to 4.0.27.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.27] - 2022-11-24</h2>
<h3>Features</h3>
<ul>
<li>Have <code>Arg::value_parser</code> accept <code>Vec<impl
Into<PossibleValue>></code></li>
<li>Implement <code>Display</code> and <code>FromStr</code> for
<code>ColorChoice</code></li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Remove soundness issue by switching from <code>atty</code> to
<code>is-terminal</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="3262016c26"><code>3262016</code></a>
chore: Release</li>
<li><a
href="757f95b2e9"><code>757f95b</code></a>
docs: Update changelog</li>
<li><a
href="20e02eb34e"><code>20e02eb</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4509">#4509</a>
from epage/possible</li>
<li><a
href="fb1d960fe2"><code>fb1d960</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4249">#4249</a>
from jcgruenhage/replace-atty</li>
<li><a
href="94aca92e44"><code>94aca92</code></a>
feat: Create ValueParser from Vec<PossibleValue></li>
<li><a
href="3bccfced1a"><code>3bccfce</code></a>
docs: Clarify PossibleValue is likely not needed</li>
<li><a
href="19981a2455"><code>19981a2</code></a>
docs: Clarify ColorChoice impls ValueEnum</li>
<li><a
href="8d92f3e7a8"><code>8d92f3e</code></a>
feat: Add Display/FromStr to ColorChoice</li>
<li><a
href="ed683ef248"><code>ed683ef</code></a>
fix: Always expose ColorChoice</li>
<li><a
href="789bfd6813"><code>789bfd6</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4508">#4508</a>
from epage/style</li>
<li>Additional commits viewable in <a
href="https://github.com/clap-rs/clap/compare/v4.0.26...v4.0.27">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.42
to 0.10.43.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="7db5cc72d3"><code>7db5cc7</code></a>
Release openssl v0.10.43</li>
<li><a
href="d5037d4dca"><code>d5037d4</code></a>
Release openssl-sys v0.9.78</li>
<li><a
href="d43b2e117b"><code>d43b2e1</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1736">#1736</a>
from wiktor-k/improve-pkey-docs</li>
<li><a
href="6c52dd4928"><code>6c52dd4</code></a>
Improve <code>PKey</code> documentation related to ed25519/ed448</li>
<li><a
href="9ab49ba3e3"><code>9ab49ba</code></a>
Fix lint error on clippy 1.65</li>
<li><a
href="b30313a977"><code>b30313a</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1710">#1710</a>
from alexanderjordanbaker/X509VerifyTimeDepth</li>
<li><a
href="2aed206e9b"><code>2aed206</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1728">#1728</a>
from wiktor-k/fix-elliptic</li>
<li><a
href="520f6efb94"><code>520f6ef</code></a>
Fix reference to ECC</li>
<li><a
href="0ba0c716ea"><code>0ba0c71</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sfackler/rust-openssl/issues/1709">#1709</a>
from wiktor-k/add-dsa-sig</li>
<li><a
href="808b9519c4"><code>808b951</code></a>
Add support for X509_VERIFY_PARAM_set_time and
X509_VERIFY_PARAM_set_depth</li>
<li>Additional commits viewable in <a
href="https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.42...openssl-v0.10.43">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.88 to
1.0.89.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/serde-rs/json/releases">serde_json's
releases</a>.</em></p>
<blockquote>
<h2>v1.0.89</h2>
<ul>
<li>Fix invalid JSON incorrectly accepted when a large number has no
digits after decimal point (<a
href="https://github-redirect.dependabot.com/serde-rs/json/issues/953">#953</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="d2f936855d"><code>d2f9368</code></a>
Release 1.0.89</li>
<li><a
href="0b898369f9"><code>0b89836</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/serde-rs/json/issues/956">#956</a>
from dtolnay/decimal</li>
<li><a
href="9d94e920ef"><code>9d94e92</code></a>
Require at least one digit after decimal point</li>
<li><a
href="c27b02334b"><code>c27b023</code></a>
Add regression test for issue 953</li>
<li><a
href="586fefb5a1"><code>586fefb</code></a>
Resolve semicolon_if_nothing_returned pedantic clippy lint</li>
<li>See full diff in <a
href="https://github.com/serde-rs/json/compare/v1.0.88...v1.0.89">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
By default, Martin is now compiled without openssl, simplifying
debugging and simple case usage, whereas the docker build and CI
publishing would still use openssl
Use cross-compiler to build M1 ARM apple target. Must use vendored
openssl build because of cross-compilation.
Co-authored-by: Yuri Astrakhan <YuriAstrakhan@gmail.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.25 to 4.0.26.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.26</h2>
<h2>[4.0.26] - 2022-11-16</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Fix typos in <code>ContextKind::as_str</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.26] - 2022-11-16</h2>
<h3>Fixes</h3>
<ul>
<li><em>(error)</em> Fix typos in <code>ContextKind::as_str</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="f8e9211e38"><code>f8e9211</code></a>
chore: Release</li>
<li><a
href="6524416e9e"><code>6524416</code></a>
docs: Update changelog</li>
<li><a
href="df1efb4c53"><code>df1efb4</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4486">#4486</a>
from jpgrayson/master</li>
<li><a
href="d9c9c7bdd8"><code>d9c9c7b</code></a>
fix: ContextKind.as_str() spellings</li>
<li>See full diff in <a
href="https://github.com/clap-rs/clap/compare/v4.0.25...v4.0.26">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.24 to 4.0.25.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.25</h2>
<h2>[4.0.25] - 2022-11-15</h2>
<h3>Features</h3>
<ul>
<li><em>(error)</em> Report available subcommands when required
subcommand is missing</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.25] - 2022-11-15</h2>
<h3>Features</h3>
<ul>
<li><em>(error)</em> Report available subcommands when required
subcommand is missing</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="ba32ab87b2"><code>ba32ab8</code></a>
chore: Release</li>
<li><a
href="391cd0092d"><code>391cd00</code></a>
docs: Update changelog</li>
<li><a
href="8cefdf31cc"><code>8cefdf3</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4482">#4482</a>
from epage/suggest</li>
<li><a
href="6b62c82fe2"><code>6b62c82</code></a>
feat(parser): Show available subcommands when one is missing</li>
<li><a
href="d21ee513fd"><code>d21ee51</code></a>
test(parser): Verify subcommand required message</li>
<li>See full diff in <a
href="https://github.com/clap-rs/clap/compare/v4.0.24...v4.0.25">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.23 to 4.0.24.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.24</h2>
<h2>[4.0.24] - 2022-11-14</h2>
<h3>Fixes</h3>
<ul>
<li>Avoid panic when printing an argument that isn't built</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.24] - 2022-11-14</h2>
<h3>Fixes</h3>
<ul>
<li>Avoid panic when printing an argument that isn't built</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="010976c2ff"><code>010976c</code></a>
chore: Release</li>
<li><a
href="0bafd2f52d"><code>0bafd2f</code></a>
docs: Update changelog</li>
<li><a
href="8171a5f6d0"><code>8171a5f</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4480">#4480</a>
from epage/panic</li>
<li><a
href="c939de8a25"><code>c939de8</code></a>
fix: Don't panic on non-built arg rendering</li>
<li>See full diff in <a
href="https://github.com/clap-rs/clap/compare/v4.0.23...v4.0.24">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.22 to 4.0.23.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.23</h2>
<h2>[4.0.23] - 2022-11-11</h2>
<h3>Fixes</h3>
<ul>
<li>Don't panic on reporting invalid-long errors when followed by
invalid UTF8</li>
<li><em>(help)</em> Clarified argument to <code>help</code>
subcommand</li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.23] - 2022-11-11</h2>
<h3>Fixes</h3>
<ul>
<li>Don't panic on reporting invalid-long errors when followed by
invalid UTF8</li>
<li><em>(help)</em> Clarified argument to <code>help</code>
subcommand</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="95144b7590"><code>95144b7</code></a>
chore: Release</li>
<li><a
href="20ecae1cb3"><code>20ecae1</code></a>
docs: Update changelog</li>
<li><a
href="e6a3529e24"><code>e6a3529</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4474">#4474</a>
from epage/utf8</li>
<li><a
href="e9cbed34cd"><code>e9cbed3</code></a>
fix(parser): Don't panic on invalid UTF-8 values</li>
<li><a
href="45d26e0013"><code>45d26e0</code></a>
test(parser): Show UTF8 bug</li>
<li><a
href="4d69e56f06"><code>4d69e56</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4471">#4471</a>
from epage/assert</li>
<li><a
href="ec03972023"><code>ec03972</code></a>
test(assert): Verify empty positional assert exists</li>
<li><a
href="0d27188d87"><code>0d27188</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4465">#4465</a>
from epage/help</li>
<li><a
href="9376a57d40"><code>9376a57</code></a>
fix(help): Clarify that 'help' command accepts multiple</li>
<li>See full diff in <a
href="https://github.com/clap-rs/clap/compare/v4.0.22...v4.0.23">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.0.18 to 4.0.22.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/releases">clap's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.22</h2>
<h2>[4.0.22] - 2022-11-07</h2>
<h3>Fixes</h3>
<ul>
<li><em>(help)</em> Don't overflow into next-line-help early due to
stale (pre-v4) padding calculations</li>
</ul>
<h2>v4.0.21</h2>
<h2>[4.0.21] - 2022-11-07</h2>
<h3>Features</h3>
<ul>
<li><em>(derive)</em> <code>long_about</code> and <code>long_help</code>
attributes, without a value, force using doc comment (before it wouldn't
be set if there wasn't anything different than the short help)</li>
</ul>
<h2>v4.0.20</h2>
<h2>[4.0.20] - 2022-11-07</h2>
<h3>Fixes</h3>
<ul>
<li><em>(derive)</em> Allow defaulted value parser for '()' fields</li>
</ul>
<h2>v4.0.19</h2>
<h2>[4.0.19] - 2022-11-04</h2>
<h3>Features</h3>
<ul>
<li><code>ColorChoice</code> now implements <code>ValueEnum</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/clap-rs/clap/blob/master/CHANGELOG.md">clap's
changelog</a>.</em></p>
<blockquote>
<h2>[4.0.22] - 2022-11-07</h2>
<h3>Fixes</h3>
<ul>
<li><em>(help)</em> Don't overflow into next-line-help early due to
stale (pre-v4) padding calculations</li>
</ul>
<h2>[4.0.21] - 2022-11-07</h2>
<h3>Features</h3>
<ul>
<li><em>(derive)</em> <code>long_about</code> and <code>long_help</code>
attributes, without a value, force using doc comment (before it wouldn't
be set if there wasn't anything different than the short help)</li>
</ul>
<h2>[4.0.20] - 2022-11-07</h2>
<h3>Fixes</h3>
<ul>
<li><em>(derive)</em> Allow defaulted value parser for '()' fields</li>
</ul>
<h2>[4.0.19] - 2022-11-04</h2>
<h3>Features</h3>
<ul>
<li><code>ColorChoice</code> now implements <code>ValueEnum</code></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="6cbe5c4323"><code>6cbe5c4</code></a>
chore: Release</li>
<li><a
href="d2739c95cf"><code>d2739c9</code></a>
docs: Update changelog</li>
<li><a
href="eaa6bfe826"><code>eaa6bfe</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4463">#4463</a>
from epage/help</li>
<li><a
href="dfe9e73880"><code>dfe9e73</code></a>
fix(help): Update auto-next-line to use new padding</li>
<li><a
href="539577dfb2"><code>539577d</code></a>
refactor(help): Remove dead code</li>
<li><a
href="bc457b179f"><code>bc457b1</code></a>
chore: Release</li>
<li><a
href="d5c3c13ec2"><code>d5c3c13</code></a>
docs: Update changelog</li>
<li><a
href="87edc19ef7"><code>87edc19</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/clap-rs/clap/issues/4461">#4461</a>
from epage/help</li>
<li><a
href="c37ab6c205"><code>c37ab6c</code></a>
fix(derive): Allow 'long_help' to force populating from doc comment</li>
<li><a
href="8751152316"><code>8751152</code></a>
test(derive): Verify long_help behavior</li>
<li>Additional commits viewable in <a
href="https://github.com/clap-rs/clap/compare/v4.0.18...v4.0.22">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [env_logger](https://github.com/env-logger-rs/env_logger) from
0.9.1 to 0.9.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/env-logger-rs/env_logger/releases">env_logger's
releases</a>.</em></p>
<blockquote>
<h2>v0.9.3</h2>
<p>Fix a regression from v0.9.2 where <code>env_logger</code> would fail
to compile with the <code>termcolor</code> feature turned off.</p>
<h2>v0.9.2</h2>
<p>Fix and un-deprecate <code>Target::Pipe</code>, which was basically
not working at all before and deprecated in 0.9.1.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="3da11042a1"><code>3da1104</code></a>
Release version 0.9.3</li>
<li><a
href="21f421ca35"><code>21f421c</code></a>
Make ci package build on 1.41 again</li>
<li><a
href="bdae47c437"><code>bdae47c</code></a>
Fix build breakage in 0.9.2 without termcolor feature</li>
<li><a
href="555cbc2f31"><code>555cbc2</code></a>
Release version 0.9.2</li>
<li><a
href="c89f719621"><code>c89f719</code></a>
Fix clippy lints</li>
<li><a
href="84b701dac9"><code>84b701d</code></a>
Change Pipe to always use the test (uncolored) semantics</li>
<li><a
href="9edf205f7c"><code>9edf205</code></a>
Revert "Deprecate Target::Pipe since it is broken"</li>
<li>See full diff in <a
href="https://github.com/env-logger-rs/env_logger/compare/v0.9.1...v0.9.3">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Change docker image to use `entrypoint` -- so that Martin can be used
as a command:
```bash
docker run maplibre/martin <parameters>
```
* The docker image is now tested the same way as in the CI tests
* Added a few changes to the justfile
Fixes#436
Rework CI to run tests locally using the VM-installed Postgres on all
target platforms.
### CI jobs
* Build release versions on Linux/Win/Mac and save build results as
output artifacts
* In a separate VMs (Linux/Win/Mac)
* use
[nyurik/action-setup-postgis](https://github.com/nyurik/action-setup-postgis)
to install postgis and run tests using the built artifacts
* run `cargo test` on Linux only
* copy built artifacts from the build step, and run tests using the
release martin binary
* package and publish if this is a release
### Other changes
* Port some minor changes from the rewrite to porting easier
* minor cleanups
* remove all "expected" data files - too unstable to be usable
Bumps [tilejson](https://github.com/georust/tilejson) from 0.3.1 to
0.3.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/georust/tilejson/releases">tilejson's
releases</a>.</em></p>
<blockquote>
<h2>Release TileJSON v3 support, bounds, and center structs</h2>
<p>Note that this GitHub release catches up to what has been release to
<a href="https://crates.io/crates/tilejson">crates.io</a></p>
<p><strong>ATTENTION:</strong> This release contains many breaking
changes. See <a
href="https://github.com/georust/tilejson/blob/HEAD/README.md">README</a>
for usage examples.</p>
<h3>v0.3.2 (2022-10-30)</h3>
<ul>
<li>Add <code>Bounds::from</code> for <code>[f64; 4]</code>, <code>[f32;
4]</code>, <code>[i32; 4]</code></li>
<li>Add <code>Bounds::try_from</code> now also supports
<code>&[f64]</code>, <code>&[f32]</code>,
<code>&[i32]</code> in addition to <code>Vec<f64></code></li>
</ul>
<h3>v0.3.1 (2022-05-29)</h3>
<ul>
<li>Add <code>Bounds::MAX</code> to create a maximum -180..180, -90..90
value.</li>
<li>Add <code>Bounds::MAX_TILED</code> to create a maximum allowed for
vector tiles per spec.</li>
<li>Implement <code>Add</code> and <code>AddAssign</code> on
<code>Bounds</code></li>
</ul>
<h3>v0.3.0 (2022-05-25)</h3>
<ul>
<li>Migrate to Rust 2021 edition</li>
<li>update docs to match v3.0.0 spec</li>
<li>add <code>fillzoom</code> field per v3.0.0 spec</li>
<li>add <code>Center</code> and <code>Bounds</code> structs instead of
arrays
<ul>
<li>both support <code>FromStr</code> trait</li>
</ul>
</li>
<li>add <code>VectorLayer</code> struct and the
<code>vector_layer</code> field</li>
<li>Remove builder pattern because <code>TileJSON</code> is
writable</li>
<li>Add <code>other</code> fields for any unknown fields in root and
vector layers</li>
<li>Restructure instantiation:
<ul>
<li>use <code>tilejson!{ source }</code> macro to create
<code>TileJSON</code> objects, with any number of the optional
<code>field: value</code> pairs.</li>
<li>use <code>set_missing_defaults()</code> to replace all missing
values with their defaults (only if the spec defines it)</li>
</ul>
</li>
<li>Remove <code>id</code> field because it is not supported by the
spec</li>
</ul>
<h2>Relevant PRs</h2>
<ul>
<li>Implement v3 by <a
href="https://github.com/nyurik"><code>@nyurik</code></a> in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/12">georust/tilejson#12</a></li>
<li>add Center and Bounds structs by <a
href="https://github.com/nyurik"><code>@nyurik</code></a> in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/13">georust/tilejson#13</a></li>
<li>Refactor instantiation, vector layers by <a
href="https://github.com/nyurik"><code>@nyurik</code></a> in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/14">georust/tilejson#14</a></li>
<li>Use tilejson! macro for instantiation, refactor by <a
href="https://github.com/nyurik"><code>@nyurik</code></a> in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/16">georust/tilejson#16</a></li>
<li>Add Bounds MAX, MAX_TILED, Add, AddAssign by <a
href="https://github.com/nyurik"><code>@nyurik</code></a> in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/19">georust/tilejson#19</a></li>
<li>Make <code>Bounds::try_from()</code> more generic by <a
href="https://github.com/nyurik"><code>@nyurik</code></a> in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/18">georust/tilejson#18</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/atouchet"><code>@atouchet</code></a>
made their first contribution in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/8">georust/tilejson#8</a></li>
<li><a href="https://github.com/nyurik"><code>@nyurik</code></a> made
their first contribution in <a
href="https://github-redirect.dependabot.com/georust/tilejson/pull/9">georust/tilejson#9</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/georust/tilejson/compare/v0.2.4...v0.3.2">https://github.com/georust/tilejson/compare/v0.2.4...v0.3.2</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/georust/tilejson/blob/main/CHANGELOG.md">tilejson's
changelog</a>.</em></p>
<blockquote>
<h3>v0.3.2 (2022-10-30)</h3>
<ul>
<li>Add <code>Bounds::from</code> for <code>[f64; 4]</code>, <code>[f32;
4]</code>, <code>[i32; 4]</code></li>
<li>Add <code>Bounds::try_from</code> now also supports
<code>&[f64]</code>, <code>&[f32]</code>,
<code>&[i32]</code> in addition to <code>Vec<f64></code></li>
</ul>
<p><!-- raw HTML omitted --><!-- raw HTML omitted --></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/georust/tilejson/commits/v0.3.2">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actix-cors](https://github.com/actix/actix-extras) from 0.6.3 to
0.6.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actix/actix-extras/releases">actix-cors's
releases</a>.</em></p>
<blockquote>
<h2>actix-cors: v0.6.4</h2>
<ul>
<li>Add <code>Cors::allow_private_network_access()</code> behind an
unstable flag (<code>draft-private-network-access</code>). <a
href="https://github-redirect.dependabot.com/actix/actix-extras/issues/297">#297</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="b95ce3a210"><code>b95ce3a</code></a>
prepare actix-cors release 0.6.4</li>
<li><a
href="ac444ca798"><code>ac444ca</code></a>
add support for private network access cors header (<a
href="https://github-redirect.dependabot.com/actix/actix-extras/issues/297">#297</a>)</li>
<li><a
href="fb8a814acb"><code>fb8a814</code></a>
session: Fix a typo in a link to actix-redis (<a
href="https://github-redirect.dependabot.com/actix/actix-extras/issues/293">#293</a>)</li>
<li><a
href="da0a806e8d"><code>da0a806</code></a>
clippy</li>
<li><a
href="d28ab6eaa1"><code>d28ab6e</code></a>
CORS origin does not end with / (<a
href="https://github-redirect.dependabot.com/actix/actix-extras/issues/291">#291</a>)</li>
<li><a
href="a2c5cbd637"><code>a2c5cbd</code></a>
fix cors changelog</li>
<li>See full diff in <a
href="https://github.com/actix/actix-extras/compare/cors-v0.6.3...cors-v0.6.4">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Add justfile to simplify running all the tests
* Save all PBF outputs to the text files
* Consolidate all tests to reuse the same code
* Consolidate database initialization
* updated readme with the new instructions
Note that while this PR creates "expected" files, the CI cannot validate
the generated results because the output is not stable. Eventually we
may try to output just the non-geometry values to have reasonable tests
comparing against the expected results.
This PR re-uses some ideas by @gbip from #448
* move all CI github workflow tests into the dedicated shell scripts
* consolitade two database initialization scripts into one
* Detect all unrecognized config file values, and report them. Ideally
we want to use `serde-ignored` crate, but it doesn't work with flattened
structs (yet). So using a bad workaround.
* CI test has been using all sorts of somewhat duplicated temporary pbf
files - cleaned up to `tmp.pbf`, and made sure curl only shows errors,
not download stats.
* In CI, crash psql instead of silently ignoring errors
* Don't serialize optional config values as nulls
* Tiny error message cleanup
Bumps [serde_yaml](https://github.com/dtolnay/serde-yaml) from 0.9.13 to
0.9.14.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dtolnay/serde-yaml/releases">serde_yaml's
releases</a>.</em></p>
<blockquote>
<h2>0.9.14</h2>
<ul>
<li>Implement <code>Deserializer</code> for <code>TaggedValue</code> and
<code>&TaggedValue</code> (<a
href="https://github-redirect.dependabot.com/dtolnay/serde-yaml/issues/339">#339</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="8948d368c0"><code>8948d36</code></a>
Release 0.9.14</li>
<li><a
href="8d95125eed"><code>8d95125</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/dtolnay/serde-yaml/issues/339">#339</a>
from dtolnay/deserializertaggedvalue</li>
<li><a
href="371f764d32"><code>371f764</code></a>
Implement Deserializer for TaggedValue and &TaggedValue</li>
<li><a
href="c5523fe475"><code>c5523fe</code></a>
Replace nonstandard SError name used only in Value Deserialize</li>
<li><a
href="516fdff567"><code>516fdff</code></a>
Ignore uninlined_format_args pedantic clippy lint</li>
<li><a
href="31fa98e396"><code>31fa98e</code></a>
Pull in unsafe-libyaml 0.2.4</li>
<li>See full diff in <a
href="https://github.com/dtolnay/serde-yaml/compare/0.9.13...0.9.14">compare
view</a></li>
</ul>
</details>
<br />
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
</details>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
