Ismayil Mirzali
c358ec53af
feat/add arm64 docker support ( #613 )
...
This PR adds the Dockerfile to make `linux/arm64` and `darwin/arm64`
builds easier/possible.
closes #603
closes #505
---------
Signed-off-by: Ismayil Mirzali <ismayilmirzeli@gmail.com>
Co-authored-by: Yuri Astrakhan <YuriAstrakhan@gmail.com>
2023-03-28 06:28:55 +00:00
Yuri Astrakhan
0ffd712927
bump versions, update lock
2023-03-25 14:41:52 -04:00
Stepan Kuzmin
79c8ccb452
Migrate to GitHub Docker registry ( #602 )
...
Publishes Martin Docker Image to GitHub Docker Registry as
[`ghcr.io/maplibre/martin`](https://ghcr.io/maplibre/martin )
Closes https://github.com/maplibre/martin/issues/601
---------
Co-authored-by: Yuri Astrakhan <YuriAstrakhan@gmail.com>
2023-03-16 16:01:33 -04:00
Yuri Astrakhan
fbb282dcb7
Improve SSL support ( #567 )
...
This is a partial fix for #496
* BREAKING: Now Martin behaves the same way as `psql` -- by default, if
SSL is available on the server, it will be used, even though it will not
verify that the server has a valid SSL certificate
* Martin now understands `PGSSLCERT`, `PGSSLKEY`, and `PGSSLROOTCERT`
env vars (and corresponding config keys) - same as psql.
* Martin can now process `?sslmode=verify-ca` and `verify-full` (just
like psql). The verify modes require root and/or client cert & key.
* remove `danger_accept_invalid_certs` -- turns out that behavior is
expected by default unless ssl mode is set to verify - which upstream
lib [does not
support](https://github.com/sfackler/rust-postgres/issues/768 ) - PR
[submitted](https://github.com/sfackler/rust-postgres/pull/988 ).
* added connection_timeout_ms option for postgres and set it to 5
seconds by default. This way it will fail out earlier.
* added error reporting to bb8 - but it is currently [broken
upstream](https://github.com/djc/bb8/issues/151 ) - not sure we can fix
it easily, so may need to switch to deadpool later.
* added docker-based TLS test (horray!) - wasn't trivial at all, despite
ending up fairly simple.
2023-02-06 14:32:28 -05:00
dependabot[bot]
545a033719
chore(deps): Bump docker/build-push-action from 3 to 4 ( #562 )
...
Bumps
[docker/build-push-action](https://github.com/docker/build-push-action )
from 3 to 4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/docker/build-push-action/releases ">docker/build-push-action's
releases</a>.</em></p>
<blockquote>
<h2>v4.0.0</h2>
<blockquote>
<p><strong>Warning</strong></p>
<p>Buildx v0.10 enables support for a minimal <a
href="https://slsa.dev/provenance/ ">SLSA Provenance</a> attestation,
which requires support for <a
href="https://github.com/opencontainers/image-spec ">OCI-compliant</a>
multi-platform images. This may introduce issues with registry and
runtime support (e.g. <a
href="https://github-redirect.dependabot.com/docker/buildx/issues/1533 ">Google
Cloud Run and AWS Lambda</a>). You can optionally disable the default
provenance attestation functionality using <code>provenance:
false</code>.</p>
</blockquote>
<ul>
<li>Revert disable provenance by default if not set by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> in <a
href="https://github-redirect.dependabot.com/docker/build-push-action/pull/784 ">docker/build-push-action#784</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v3.3.1...v4.0.0 ">https://github.com/docker/build-push-action/compare/v3.3.1...v4.0.0 </a></p>
<h2>v3.3.1</h2>
<ul>
<li>Disable provenance by default if not set by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/781 ">#781</a>)</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v3.3.0...v3.3.1 ">https://github.com/docker/build-push-action/compare/v3.3.0...v3.3.1 </a></p>
<h2>v3.3.0</h2>
<blockquote>
<p><strong>Warning</strong></p>
<p>Buildx v0.10 enables support for a minimal <a
href="https://slsa.dev/provenance/ ">SLSA Provenance</a> attestation,
which requires support for <a
href="https://github.com/opencontainers/image-spec ">OCI-compliant</a>
multi-platform images. This may introduce issues with registry and
runtime support (e.g. <a
href="https://github-redirect.dependabot.com/docker/buildx/issues/1533 ">Google
Cloud Run and AWS Lambda</a>). You can optionally disable the default
provenance attestation functionality using <code>provenance:
false</code>.</p>
</blockquote>
<ul>
<li>Add <code>attests</code>, <code>provenance</code> and
<code>sbom</code> inputs by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/746 ">#746</a>
<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/759 ">#759</a>)</li>
<li>Log GitHub Actions runtime token access controls by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/707 ">#707</a>)</li>
<li>Examples moved to <a
href="https://docs.docker.com/build/ci/github-actions/examples/ ">docs
website</a> by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/718 ">#718</a>)</li>
<li>Bump minimatch from 3.0.4 to 3.1.2 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/732 ">#732</a>)</li>
<li>Bump csv-parse from 5.3.0 to 5.3.3 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/729 ">#729</a>)</li>
<li>Bump json5 from 2.2.0 to 2.2.3 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/749 ">#749</a>)</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v3.2.0...v3.3.0 ">https://github.com/docker/build-push-action/compare/v3.2.0...v3.3.0 </a></p>
<h2>v3.2.0</h2>
<ul>
<li>Remove workaround for <code>setOutput</code> by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/704 ">#704</a>)</li>
<li>Docs: fix Git context link and add more details about subdir support
by <a href="https://github.com/crazy-max "><code>@crazy-max</code></a>
(<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/685 ">#685</a>)</li>
<li>Docs: named context by <a
href="https://github.com/baibaratsky "><code>@baibaratsky</code></a> and
<a href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/665 ">#665</a>)</li>
<li>Bump <code>@actions/core</code> from 1.9.0 to 1.10.0 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/667 ">#667</a>
<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/695 ">#695</a>)</li>
<li>Bump <code>@actions/github</code> from 5.0.3 to 5.1.1 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/696 ">#696</a>)</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v3.1.1...v3.2.0 ">https://github.com/docker/build-push-action/compare/v3.1.1...v3.2.0 </a></p>
<h2>v3.1.1</h2>
<ul>
<li>Fix GitHub token not passed with Git context if subdir defined by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/663 ">#663</a>)</li>
<li>Replace deprecated <code>fs.rmdir</code> with <code>fs.rm</code> by
<a href="https://github.com/bendrucker "><code>@bendrucker</code></a>
(<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/657 ">#657</a>)</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v3.1.0...v3.1.1 ">https://github.com/docker/build-push-action/compare/v3.1.0...v3.1.1 </a></p>
<h2>v3.1.0</h2>
<ul>
<li><code>no-cache-filters</code> input by <a
href="https://github.com/crazy-max "><code>@crazy-max</code></a> (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/653 ">#653</a>)</li>
<li>Bump <code>@actions/github</code> from 5.0.1 to 5.0.3 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/619 ">#619</a>)</li>
<li>Bump <code>@actions/core</code> from 1.6.0 to 1.9.0 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/620 ">#620</a>
<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/637 ">#637</a>)</li>
<li>Bump csv-parse from 5.0.4 to 5.3.0 (<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/623 ">#623</a>
<a
href="https://github-redirect.dependabot.com/docker/build-push-action/issues/650 ">#650</a>)</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/docker/build-push-action/compare/v3.0.0...v3.1.0 ">https://github.com/docker/build-push-action/compare/v3.0.0...v3.1.0 </a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="3b5e8027fchttps://github-redirect.dependabot.com/docker/build-push-action/issues/784 ">#784</a>
from crazy-max/enable-provenance</li>
<li><a
href="02d3266a89f403dafe18https://github.com/docker/build-push-action/compare/v3...v4 ">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>
2023-01-31 13:50:10 +02:00
dependabot[bot]
f56be44089
chore(deps): Bump dependabot/fetch-metadata from 1.3.5 to 1.3.6 ( #558 )
...
Bumps
[dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata )
from 1.3.5 to 1.3.6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dependabot/fetch-metadata/releases ">dependabot/fetch-metadata's
releases</a>.</em></p>
<blockquote>
<h2>v1.3.6</h2>
<h2>What's Changed</h2>
<ul>
<li>Drop mention of "locally" by <a
href="https://github.com/jeffwidman "><code>@jeffwidman</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/281 ">dependabot/fetch-metadata#281</a></li>
<li>Don't assume <code>git pull</code> fetches all branches/tags by <a
href="https://github.com/jeffwidman "><code>@jeffwidman</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/284 ">dependabot/fetch-metadata#284</a></li>
<li>Clarify release notes slightly by <a
href="https://github.com/jeffwidman "><code>@jeffwidman</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/283 ">dependabot/fetch-metadata#283</a></li>
<li>Bump eslint-plugin-promise from 6.0.1 to 6.1.1 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/287 ">dependabot/fetch-metadata#287</a></li>
<li>Bump <code>@typescript-eslint/parser</code> from 5.38.0 to 5.45.0
by <a href="https://github.com/dependabot "><code>@dependabot</code></a>
in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/290 ">dependabot/fetch-metadata#290</a></li>
<li>Bump yargs and <code>@types/yargs</code> by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/286 ">dependabot/fetch-metadata#286</a></li>
<li>Bump <code>@types/node</code> from 18.11.9 to 18.11.10 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/289 ">dependabot/fetch-metadata#289</a></li>
<li>Bump decode-uri-component from 0.2.0 to 0.2.2 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/291 ">dependabot/fetch-metadata#291</a></li>
<li>Bump yaml from 2.1.1 to 2.1.3 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/288 ">dependabot/fetch-metadata#288</a></li>
<li>Bump <code>@types/node</code> from 18.11.10 to 18.11.18 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/296 ">dependabot/fetch-metadata#296</a></li>
<li>Bump <code>@vercel/ncc</code> from 0.34.0 to 0.36.0 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/294 ">dependabot/fetch-metadata#294</a></li>
<li>Bump dotenv from 16.0.2 to 16.0.3 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/293 ">dependabot/fetch-metadata#293</a></li>
<li>Bump typescript from 4.8.3 to 4.9.4 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/295 ">dependabot/fetch-metadata#295</a></li>
<li>Bump yaml from 2.1.3 to 2.2.1 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/292 ">dependabot/fetch-metadata#292</a></li>
<li>Bump json5 from 1.0.1 to 1.0.2 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/297 ">dependabot/fetch-metadata#297</a></li>
<li>Bump eslint from 8.23.1 to 8.32.0 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/303 ">dependabot/fetch-metadata#303</a></li>
<li>Bump <code>@typescript-eslint/parser</code> from 5.45.0 to 5.48.2
by <a href="https://github.com/dependabot "><code>@dependabot</code></a>
in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/300 ">dependabot/fetch-metadata#300</a></li>
<li>Bump <code>@typescript-eslint/eslint-plugin</code> from 5.42.0 to
5.48.2 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/302 ">dependabot/fetch-metadata#302</a></li>
<li>Bump eslint-plugin-import from 2.26.0 to 2.27.5 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/301 ">dependabot/fetch-metadata#301</a></li>
<li>Bump nock from 13.2.9 to 13.3.0 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/299 ">dependabot/fetch-metadata#299</a></li>
<li>Bump <code>@types/yargs</code> from 17.0.15 to 17.0.19 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/304 ">dependabot/fetch-metadata#304</a></li>
<li>Fix parser for libraries by <a
href="https://github.com/kachick "><code>@kachick</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/224 ">dependabot/fetch-metadata#224</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/kachick "><code>@kachick</code></a> made
their first contribution in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/224 ">dependabot/fetch-metadata#224</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dependabot/fetch-metadata/compare/v1...v1.3.6 ">https://github.com/dependabot/fetch-metadata/compare/v1...v1.3.6 </a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="4de7a6c08chttps://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/306 ">#306</a>
from dependabot/v1.3.6-release-notes</li>
<li><a
href="dfa376e5c12b4e1681e0https://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/224 ">#224</a>
from kachick/fix-get-info-for-library</li>
<li><a
href="0a3f18375acf0e9797126b3627f3f1https://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/304 ">#304</a>
from dependabot/dependabot/npm_and_yarn/types/yargs-1...</li>
<li><a
href="b385d6219bab5ccc9b61https://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/299 ">#299</a>
from dependabot/dependabot/npm_and_yarn/nock-13.3.0</li>
<li><a
href="ce0ec4e5d526d146ee07https://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/301 ">#301</a>
from dependabot/dependabot/npm_and_yarn/eslint-plugin...</li>
<li>Additional commits viewable in <a
href="https://github.com/dependabot/fetch-metadata/compare/v1.3.5...v1.3.6 ">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>
2023-01-24 22:39:53 +00:00
Yuri Astrakhan
64ad07ce36
Fix legacy DB, add CI tests ( #547 )
...
* fixed SQL to work on older PG versions
* re-enable CI to test expected `test.sh` output against the one stored
in the `tests/expected`
* add postgres in docker tests on linux - one for the oldest supported
DB, and another using the more recent version
* minor justfile cleanup
* ensure config files are sorted alphabetically
2023-01-01 05:03:21 +00:00
Yuri Astrakhan
cb99b835e9
Enable clippy pedantic, fix lints ( #525 )
...
Pedantic lints often offer some good insight into the code. It is
usually easier to sprinkle a few "allow"-s around, than to miss some
important life hack offered by clippy.
Also, make use a different martin port when running integration tests
locally (make sure `git push` works even if martin is running).
2022-12-18 21:24:06 -05:00
Yuri Astrakhan
46e409dd1a
add v0.6 branch to CI
2022-12-13 16:20:52 -05:00
Yuri Astrakhan
68c6259d32
Catch errors in tests, minor fixes ( #514 )
...
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
2022-12-12 09:11:10 -05:00
Yuri Astrakhan
3c3f4ecd51
Fix workflow trigger on release ( #501 )
...
Need to limit releases to the published events,
otherwise it gets re-triggered on every release notes editing.
2022-12-04 14:34:13 +09:00
Yuri Astrakhan
0576ca9442
fix docker build issues
2022-11-19 13:31:18 -05:00
Yuri Astrakhan
0a5e449ca9
fix CI tests to include all targets and docs ( #483 )
2022-11-19 15:52:58 +00:00
Yuri Astrakhan
0e0763a739
Make SSL support optional ( #488 )
...
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
2022-11-19 09:50:27 -05:00
Yuri Astrakhan
4d62704d2f
fix docker bld on release ( #487 )
2022-11-19 12:32:23 +02:00
Yuri Astrakhan
88633cc776
need different names in CI
2022-11-18 17:39:44 -05:00
Yuri Astrakhan
542af0c9e5
Rename build steps
2022-11-18 17:17:08 -05:00
Stepan Kuzmin
935c251afd
Add Apple M1 target aarch64-apple-darwin to CI ( #486 )
...
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>
2022-11-18 17:12:55 -05:00
dependabot[bot]
aabc31e067
chore(deps): bump dependabot/fetch-metadata from 1.3.4 to 1.3.5 ( #475 )
...
Bumps
[dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata )
from 1.3.4 to 1.3.5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/dependabot/fetch-metadata/releases ">dependabot/fetch-metadata's
releases</a>.</em></p>
<blockquote>
<h2>v1.3.5</h2>
<h2>What's Changed</h2>
<ul>
<li>v1.3.4 Release Notes by <a
href="https://github.com/Nishnha "><code>@Nishnha</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/267 ">dependabot/fetch-metadata#267</a></li>
<li>docs: fix auto-merge example by <a
href="https://github.com/rribeiro1 "><code>@rribeiro1</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/250 ">dependabot/fetch-metadata#250</a></li>
<li>Bump <code>@types/node</code> from 18.7.18 to 18.11.9 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/275 ">dependabot/fetch-metadata#275</a></li>
<li>Fix object-shorthand linter warnings by <a
href="https://github.com/mattt "><code>@mattt</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/276 ">dependabot/fetch-metadata#276</a></li>
<li>Bump <code>@actions/core</code> from 1.9.1 to 1.10.0 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/272 ">dependabot/fetch-metadata#272</a></li>
<li>Bump <code>@typescript-eslint/eslint-plugin</code> from 5.38.0 to
5.42.0 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/274 ">dependabot/fetch-metadata#274</a></li>
<li>Bump <code>@actions/github</code> from 5.0.3 to 5.1.1 by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/271 ">dependabot/fetch-metadata#271</a></li>
<li>Bump yargs and <code>@types/yargs</code> by <a
href="https://github.com/dependabot "><code>@dependabot</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/273 ">dependabot/fetch-metadata#273</a></li>
<li>Document steps for cutting a new release by <a
href="https://github.com/jeffwidman "><code>@jeffwidman</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/252 ">dependabot/fetch-metadata#252</a></li>
<li>Don't bump pin versions in <code>README.md</code> by <a
href="https://github.com/jeffwidman "><code>@jeffwidman</code></a> in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/280 ">dependabot/fetch-metadata#280</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/Nishnha "><code>@Nishnha</code></a> made
their first contribution in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/267 ">dependabot/fetch-metadata#267</a></li>
<li><a href="https://github.com/rribeiro1 "><code>@rribeiro1</code></a>
made their first contribution in <a
href="https://github-redirect.dependabot.com/dependabot/fetch-metadata/pull/250 ">dependabot/fetch-metadata#250</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/dependabot/fetch-metadata/compare/v1...v1.3.5 ">https://github.com/dependabot/fetch-metadata/compare/v1...v1.3.5 </a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="5ef0018793https://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/282 ">#282</a>
from dependabot/v1.3.5-release-notes</li>
<li><a
href="a9380d24b2404ba25b3fhttps://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/280 ">#280</a>
from dependabot/drop-readme-from-bump-script</li>
<li><a
href="f40d4c77c97db64c379fhttps://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/252 ">#252</a>
from dependabot/document-release-steps</li>
<li><a
href="daa85e7aeeb768c4033e9833f74bfbhttps://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/273 ">#273</a>
from dependabot/dependabot/npm_and_yarn/yargs-and-typ...</li>
<li><a
href="32b7ed324b7942397165https://github-redirect.dependabot.com/dependabot/fetch-metadata/issues/271 ">#271</a>
from dependabot/dependabot/npm_and_yarn/actions/githu...</li>
<li>Additional commits viewable in <a
href="https://github.com/dependabot/fetch-metadata/compare/v1.3.4...v1.3.5 ">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>
2022-11-07 22:15:28 +00:00
Yuri Astrakhan
6b114cc7f1
Docker improvements and CI tests ( #472 )
...
* 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
2022-11-02 19:00:05 +01:00
Yuri Astrakhan
b8ac719be8
Rework and consolidate CI ( #467 )
...
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
2022-10-31 16:28:21 -04:00
Yuri Astrakhan
a0a411f088
Consolidate DB init and tests ( #463 )
...
* 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.
2022-10-28 14:52:39 -04:00
Yuri Astrakhan
01b9fe4fe1
Avoid using 3rd party GH actions if possible ( #464 )
...
* action-rs actions are no longer maintained, switching to the built-in
approach where possible, or dtolnay/rust-toolchain otherwise
2022-10-26 12:52:31 +03:00
Yuri Astrakhan
9b56fe7b9b
Refactor CI tests into separate scripts ( #432 )
...
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
2022-10-25 14:54:36 -04:00
Yuri Astrakhan
def4a6f1ec
Warn on unknown cfg, CI cleanup ( #461 )
...
* 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
2022-10-24 19:45:26 +02:00
Stepan Kuzmin
2e1940829d
Add separate build job in CI ( #438 )
...
This PR adds a separate build job in CI and installs OpenSSL for Windows
runner. Closes https://github.com/maplibre/martin/issues/437
2022-10-22 13:39:05 -04:00
Yuri Astrakhan
7167594afb
No point in doing a check in lint
...
it will be done in the test anyway, plus clippy does it as well.
2022-10-22 11:11:16 -04:00
Yuri Astrakhan
119a8ed201
Consolidate and simplify linting CI ( #458 )
...
Merge separate nearly-identical linting steps into one. No point to separate, and tries to abuse servers a bit less (saves power too! :) )
2022-10-22 11:01:16 -04:00
Pat Sier
7eca0540a0
Remove automated docker builds for PRs ( #450 )
...
Adds a conditional to the docker job that won't run any of the Docker build steps if triggered by a PR.
2022-10-18 10:07:51 -04:00
Yuri Astrakhan
ee08baa67b
add release trigger for the CI job
2022-10-07 16:32:40 -04:00
Yuri Astrakhan
b9ec972ac9
Revert "Run tests on ubuntu, macos, and windows"
...
This reverts commit 07a4e5c6de
2022-10-05 21:06:04 -04:00
Yuri Astrakhan
07a4e5c6de
Run tests on ubuntu, macos, and windows
2022-10-05 21:03:20 -04:00
dependabot[bot]
44f293d2bb
chore(deps): bump dependabot/fetch-metadata from 1.3.3 to 1.3.4 ( #424 )
...
Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata ) from 1.3.3 to 1.3.4.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases )
- [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.3.3...v1.3.4 )
---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-30 22:36:36 +00:00
Yuri Astrakhan
5ab2cec8f9
Attempt to migrate CI to maplibre/martin ( #408 )
...
Note that I manually published [maplibre/martin:latest](https://hub.docker.com/r/maplibre/martin ) to docker, so it might be able to pass CI ok. I have not looked deeply into the existing CI workflow - @stepankuzmin any suggestions on changes to that? The github actions are now setup
P.S. I am not certain what that whole `brew/tap` thing is - don't know enough about Macs
2022-09-26 21:48:46 -04:00
Yuri Astrakhan
7a14d6a3ed
feat!: remove --watch support ( #381 )
...
BREAKING CHANGE: Remove --watch support and ignore the command line parameter
2022-08-10 12:23:44 -04:00
Stepan Kuzmin
40d2b647a9
Auto approve Dependabot semver patch PRs ( #368 )
2022-07-29 12:20:37 +03:00
Yuri Astrakhan
275d15a4fb
chore: fix clippy in benchmarks, and adjust CI ( #363 )
...
Clippy wasn't happy, and we apparently weren't testing all targets.
2022-07-06 12:24:45 +03:00
dependabot[bot]
84a11092f4
chore(deps): bump dependabot/fetch-metadata from 1.3.2 to 1.3.3 ( #359 )
...
Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata ) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases )
- [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.3.2...v1.3.3 )
---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-05 10:21:31 -04:00
Stepan Kuzmin
ab9699482a
ci: use squash instead of merge when auto-merging Dependabot PRs ( #360 )
...
use squash instead of merge when auto-merging Dependabot PRs
2022-07-02 08:08:59 -04:00
dependabot[bot]
dd91fd0068
chore(deps): bump dependabot/fetch-metadata from 1.3.1 to 1.3.2 ( #357 )
...
Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases )
- [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.3.1...v1.3.2 )
---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-30 19:02:33 -04:00
dependabot[bot]
405e8226d5
chore(deps): bump dependabot/fetch-metadata from 1.1.1 to 1.3.1 ( #339 )
...
Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata ) from 1.1.1 to 1.3.1.
- [Release notes](https://github.com/dependabot/fetch-metadata/releases )
- [Commits](https://github.com/dependabot/fetch-metadata/compare/v1.1.1...v1.3.1 )
---
updated-dependencies:
- dependency-name: dependabot/fetch-metadata
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-29 11:17:17 +03:00
dependabot[bot]
b763fd2902
chore(deps): bump actions/checkout from 1 to 3 ( #336 )
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 1 to 3.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v1...v3 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-27 15:00:45 +03:00
dependabot[bot]
dc4058f6dd
chore(deps): bump codecov/codecov-action from 1 to 3 ( #335 )
...
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action ) from 1 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases )
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md )
- [Commits](https://github.com/codecov/codecov-action/compare/v1...v3 )
---
updated-dependencies:
- dependency-name: codecov/codecov-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-27 15:00:32 +03:00
Stepan Kuzmin
9b4df609c6
ci: enable dependabot auto-merge ( #337 )
2022-05-27 14:46:48 +03:00
Stepan Kuzmin
69bdc7f9d0
ci: improve docker job ( #334 )
2022-05-27 13:35:06 +03:00
Stepan Kuzmin
b3401785b2
feat: add default SRID support ( #308 )
...
* feat: add default SRID support
2022-02-13 15:43:52 +03:00
Stepan Kuzmin
396e563fd1
chore: update dependencies ( #278 )
...
* chore: update dependencies
* chore: use main instead of master
2021-11-07 17:28:21 +03:00
Stepan Kuzmin
fc9170d164
feat: add multiple geometry columns support in table sources ( #269 )
...
* feat: add multiple geometry columns support in table sources
* test: add multiple geometry tests
2021-10-21 12:20:33 +03:00
Stepan Kuzmin
206307fd22
test: add config and multiple zoom level tests ( #262 )
...
* test: add config and multiple zoom level tests
* test: add more fixtures
* test: use ST_CurveToLine in function source fixtures
* test: update vtzero binaries
2021-10-12 17:56:45 +03:00
Stepan Kuzmin
40b0a0c26a
feat: add bounds to tilejson endpoints ( #260 ) (h/t @jaspervercnocke)
2021-10-10 12:09:56 +03:00
