Skip to content
This repository was archived by the owner on Nov 29, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
18504ff
Update `agg_tiles_hash` docs and minor bug (#901)
nyurik Sep 28, 2023
1a386b7
Fix unit tests to use blobs only
nyurik Sep 28, 2023
f52cd3c
Minor mbtiles doc cleanups
nyurik Sep 28, 2023
73edd19
Hide pg connection password (#907)
nyurik Sep 29, 2023
6f08aa9
Fix mbtiles validation, CI, and logging (#903)
nyurik Sep 29, 2023
06ec44a
update lock
nyurik Sep 29, 2023
cd584fa
mbtiles: remove tls features, CI streamlining (#908)
nyurik Sep 30, 2023
0f1bd9e
disable bench workflow
nyurik Sep 30, 2023
d48ef47
Tiny nits to help with rustls migration
nyurik Sep 30, 2023
9ed414c
Use MUSL cross-build for ARM64 & dockers (#909)
nyurik Sep 30, 2023
976a850
Use rust-cache in CI
nyurik Sep 30, 2023
48164d7
CI: Combine cross docker builds (#910)
nyurik Sep 30, 2023
31acc7f
Do not use rust-cache on release
nyurik Sep 30, 2023
8d7204c
Switch to Rustls (#474)
nyurik Sep 30, 2023
d1fe026
Fix justfile ssl test, print hba config
nyurik Sep 30, 2023
ae8e070
ssl dockercompose test config
nyurik Sep 30, 2023
64d652f
Improve SSL mode testing (#913)
nyurik Oct 1, 2023
3adc896
version
nyurik Oct 1, 2023
14ea5cb
Update README.md
nyurik Oct 1, 2023
6b7bcab
Cleanup mbtiles, rename TileCopierOptions, testing (#916)
nyurik Oct 2, 2023
0cf57a6
bump versions
nyurik Oct 2, 2023
8002283
Update README.md
nyurik Oct 2, 2023
cc6b8fd
rename mbtiles files
nyurik Oct 2, 2023
0459d3f
add encoding=UTF8 pragma, refactoring (#919)
nyurik Oct 4, 2023
afc9ef2
chore(deps): Bump postcss from 8.4.27 to 8.4.31 in /demo/frontend (#920)
dependabot[bot] Oct 7, 2023
7d5e2ae
upgrade deps
nyurik Oct 7, 2023
eaee56c
Rename homebrew formula subdirctory (#923)
sharkAndshark Oct 8, 2023
321a969
Log a warning if PG startup takes too long (#924)
pjsier Oct 8, 2023
ecd051a
chore(deps): Bump semver from 1.0.19 to 1.0.20 (#926)
dependabot[bot] Oct 10, 2023
f4bb5c7
bump versions
nyurik Oct 10, 2023
8b34cd3
Add metadat copy/apply-diff, new testing framework (#921)
nyurik Oct 10, 2023
2817990
Update Homebrew for 0.9.0 (#932)
rubenpoppe Oct 11, 2023
58d691d
Use chmod +x in packaging, move homebrew to 9.1
nyurik Oct 11, 2023
cb7c49b
Move homebrew (#933)
nyurik Oct 12, 2023
dee3431
Updat doc about homebrew installation (#934)
sharkAndshark Oct 12, 2023
f40090a
v0.9.3 cleanups
nyurik Oct 12, 2023
9e74226
Auto-update homebrew on release (#935)
nyurik Oct 12, 2023
7114d98
CI: extract refs/tag for homebrew
nyurik Oct 12, 2023
3c24ae2
version update for pre.1
nyurik Oct 12, 2023
4d84371
use token for remote PR creation
nyurik Oct 12, 2023
e204a2f
add PAT to hombrew checkout
nyurik Oct 12, 2023
c926e51
forbid unsafe
nyurik Oct 12, 2023
3db28f9
fixing homebrew token
nyurik Oct 12, 2023
846f319
v0.9.3
nyurik Oct 12, 2023
b1b101b
fix links
nyurik Oct 12, 2023
b2b0e6f
fix spaces
nyurik Oct 12, 2023
10a5606
chore(deps): Bump cuchi/jinja2-action from 1.2.0 to 1.2.1 (#940)
dependabot[bot] Oct 12, 2023
a42ea5c
chore(deps): Bump peter-evans/create-pull-request from 3 to 5 (#939)
dependabot[bot] Oct 12, 2023
125d78c
ci cleanup
nyurik Oct 12, 2023
99b700b
chore(deps): Bump serde from 1.0.188 to 1.0.189 (#941)
dependabot[bot] Oct 13, 2023
d3ef99a
chore(deps): Bump regex from 1.10.0 to 1.10.1 (#943)
dependabot[bot] Oct 16, 2023
aeda6e6
chore(deps): Bump flate2 from 1.0.27 to 1.0.28 (#944)
dependabot[bot] Oct 16, 2023
af12018
chore(deps): Bump async-trait from 0.1.73 to 0.1.74 (#942)
dependabot[bot] Oct 16, 2023
00236bf
update lock
nyurik Oct 16, 2023
e2a26fe
more test coverage for mbtiles
nyurik Oct 16, 2023
a1f794a
mbtiles: Add `--apply-patch` to copy, rename apply-diff (#945)
nyurik Oct 16, 2023
108bc05
pg func discovery ignore sys schemas (#946)
nyurik Oct 17, 2023
f488ee5
chore(deps): Bump regex from 1.10.1 to 1.10.2 (#947)
dependabot[bot] Oct 17, 2023
2196065
chore(deps): Bump @babel/traverse from 7.22.10 to 7.23.2 in /demo/fro…
dependabot[bot] Oct 17, 2023
a0a3f49
remove unused actix crate dep
nyurik Oct 18, 2023
addefbd
bump cargo.lock
nyurik Oct 18, 2023
c2a12a3
Implement sprite catalog reporting (#951)
nyurik Oct 19, 2023
aadd20c
bump cargo.lock
nyurik Oct 19, 2023
467a265
chore(deps): Bump thiserror from 1.0.49 to 1.0.50 (#953)
dependabot[bot] Oct 20, 2023
3ef969b
update lock
nyurik Oct 20, 2023
502413a
Fix martin integration tests (#952)
nyurik Oct 20, 2023
196df9e
miro refactor and lock bump
nyurik Oct 20, 2023
e377bd6
Simplify conf parsing, separate func & tbl configs (#956)
nyurik Oct 21, 2023
b88d714
justfile insta install
nyurik Oct 21, 2023
2053f80
Provide default Source::support_url_query
nyurik Oct 21, 2023
2e7a179
Better error reporting for config and other params (#957)
nyurik Oct 22, 2023
7aa169e
[BREAKING] New bounds calculation methods (#958)
nyurik Oct 22, 2023
d9eb5fd
justfile fixes
nyurik Oct 22, 2023
4c97b7c
fix: cargo publish warning about README (#960)
DarhkVoyd Oct 24, 2023
4992267
chore(deps): Bump rustls from 0.21.7 to 0.21.8 (#967)
dependabot[bot] Oct 25, 2023
451139a
chore(deps): Bump clap from 4.4.6 to 4.4.7 (#966)
dependabot[bot] Oct 25, 2023
24787d1
update lock
nyurik Oct 25, 2023
94f2c16
fix grcov CI workflow (#968)
nyurik Oct 25, 2023
06da34c
remove unneeded btree sorting (#970)
nyurik Oct 27, 2023
0ad2949
chore(deps): Bump serde from 1.0.189 to 1.0.190 (#971)
dependabot[bot] Oct 27, 2023
a53dc12
update lock
nyurik Oct 27, 2023
525e14b
Update doc file names and title levels (#972)
sharkAndshark Oct 27, 2023
dbf25f0
update lock
nyurik Oct 28, 2023
9b112ae
Implement dynamic font support `/font/<name>/<start>-<end>` (#755)
nyurik Oct 28, 2023
8b274f4
save err for all platforms
nyurik Oct 28, 2023
0178ca7
better logging on failure
nyurik Oct 28, 2023
76a1b7f
fix CI
nyurik Oct 28, 2023
47b3106
Rename martin-mbtiles crate to mbtiles (#976)
nyurik Oct 28, 2023
f1241e2
fix CI status badges
nyurik Oct 28, 2023
8c750aa
bump lock
nyurik Oct 30, 2023
c02fa4a
Fix CI workflow
nyurik Oct 30, 2023
163b449
fix CI
nyurik Oct 30, 2023
127c989
fix font docs
nyurik Oct 30, 2023
65b1cdc
more doc fixes
nyurik Oct 30, 2023
bfbe52d
Add crate categories
nyurik Oct 30, 2023
3a1f7ac
fix image test extension
nyurik Oct 31, 2023
c6170c5
Improve MBTiles documentation (#961)
sharkAndshark Oct 31, 2023
d9f01d1
cleanup docs
nyurik Oct 31, 2023
09dd2be
cleanup trailing spaces
nyurik Oct 31, 2023
73b56e8
Include readme as docs for all crates (#981)
nyurik Oct 31, 2023
ccadb56
cargo bump, rm unused font errors
nyurik Nov 4, 2023
9ddbbe0
Downgrade nightly CI until rustc is fixed (#985)
nyurik Nov 5, 2023
fe79756
Bump lock, improve test.sh
nyurik Nov 6, 2023
faa2554
Simplify README
nyurik Nov 6, 2023
bad4efc
link to book from the banner
nyurik Nov 6, 2023
687996d
fix: Include Authorization and Accept in CORs allowed headers
chanange Apr 24, 2023
5c990b0
chore(deps): Bump rustix from 0.38.14 to 0.38.19 (#14)
dependabot[bot] Oct 18, 2023
0871a2d
Revert "fix: Include Authorization and Accept in CORs allowed headers"
jennaramdenee Nov 6, 2023
95b121d
Merge branch 'main' into sync2
jennaramdenee Nov 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,3 @@ updates:
interval: daily
time: "02:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: actix
versions:
- 0.11.0
- 0.11.1
- dependency-name: docopt
versions:
- 1.1.1
- dependency-name: actix-rt
versions:
- 2.0.0
- 2.0.2
- 2.1.0
- 2.2.0
- dependency-name: postgres
versions:
- 0.19.1
- dependency-name: serde
versions:
- 1.0.124
- 1.0.125
- dependency-name: env_logger
versions:
- 0.8.3
- dependency-name: criterion
versions:
- 0.3.4
52 changes: 52 additions & 0 deletions .github/templates/homebrew.martin.rb.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#
# ATTENTION: This is an autogenerated file. See original at
# https://github.com/maplibre/martin/blob/main/.github/templates/homebrew.martin.rb.j2
#

class Martin < Formula
current_version="{{ version }}"

desc "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support, plus an mbtiles tool"
homepage "https://github.com/maplibre/martin"

on_macos do
on_arm do
sha256 "{{ macos_arm_sha256 }}}"
url "https://github.com/maplibre/martin/releases/download/v#{current_version}/martin-Darwin-aarch64.tar.gz"
end
on_intel do
sha256 "{{ macos_intel_sha256 }}"
url "https://github.com/maplibre/martin/releases/download/v#{current_version}/martin-Darwin-x86_64.tar.gz"
end
end

on_linux do
on_arm do
sha256 "{{ linux_arm_sha256 }}"
url "https://github.com/maplibre/martin/releases/download/v#{current_version}/martin-Linux-aarch64-musl.tar.gz"
end
on_intel do
sha256 "{{ linux_intel_sha256 }}"
url "https://github.com/maplibre/martin/releases/download/v#{current_version}/martin-Linux-x86_64-musl.tar.gz"
end
end

version "#{current_version}"

def install
bin.install "martin"
bin.install "mbtiles"
end

def caveats; <<~EOS
Martin requires a database connection string.
It can be passed as a command-line argument or as a DATABASE_URL environment variable.
martin postgres://postgres@localhost/db
EOS
end

test do
`#{bin}/martin --version`
`#{bin}/mbtiles --version`
end
end
26 changes: 12 additions & 14 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
name: Benchmark

on:
pull_request:
types: [ opened, synchronize, reopened ]
paths-ignore:
- '**.md'
- 'demo/**'
- 'docs/**'
- 'homebrew-formula/**'
push:
branches: [ main ]
paths-ignore:
- '**.md'
- 'demo/**'
- 'docs/**'
- 'homebrew-formula/**'
# push:
# branches: [ main ]
# paths-ignore:
# - '**.md'
# - 'demo/**'
# - 'docs/**'
# pull_request:
# types: [ opened, synchronize, reopened ]
# paths-ignore:
# - '**.md'
# - 'demo/**'
# - 'docs/**'
workflow_dispatch:

jobs:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
group: ${{ github.workflow }}-${{ github.ref }}
steps:
- uses: actions/checkout@v4
- uses: Swatinem/rust-cache@v2

- name: Setup mdBook
uses: peaceiris/actions-mdbook@v1
Expand All @@ -23,7 +24,7 @@ jobs:

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref == 'refs/heads/main' }}
if: github.ref == 'refs/heads/main'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./target/book
Loading