Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/build-deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ jobs:
- name: Install Chromium
uses: browser-actions/setup-chrome@b94431e051d1c52dcbe9a7092a4f10f827795416 # v2.1.0
- uses: taiki-e/install-action@69e777b377e4ec209ddad9426ae3e0c1008b0ef3 # v2.64.0
with: { tool: 'mdbook,mdbook-tabs,cargo-binstall' }
- run: cargo binstall -y mdbook-mermaid-ssr # TODO: move above once merged https://github.com/taiki-e/install-action/pull/1400
with: { tool: 'mdbook,mdbook-tabs,mdbook-mermaid-ssr' }

- run: mdbook build docs

Expand Down
18 changes: 16 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,20 @@ jobs:
- run: just clippy
- run: just check
- run: just check-doc
lint-rust-dependencies:
name: Lint Rust dependencies
permissions:
contents: read
runs-on: ubuntu-latest
steps:
- run: rustup default nightly
- name: Checkout sources
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with: { persist-credentials: false }
- uses: taiki-e/install-action@69e777b377e4ec209ddad9426ae3e0c1008b0ef3 # v2.64.0
with: { tool: 'cargo-shear,just' }

- run: just shear
musl-build:
name: Build ${{ matrix.target }}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -159,7 +173,7 @@ jobs:
docker-build-test:
name: Build and test docker images
runs-on: ubuntu-latest
needs: [ musl-build, lint-unit-test-js, unit-test-rust, lint-rust ]
needs: [ musl-build, lint-unit-test-js, unit-test-rust, lint-rust, lint-rust-dependencies ]
permissions:
id-token: write
attestations: write
Expand Down Expand Up @@ -783,7 +797,7 @@ jobs:
attestations: write
# for writing release artifacts
contents: write
needs: [ lint-unit-test-js, unit-test-rust, lint-rust, test-multi-os, test-with-svc, test-aws-lambda, test-publish ]
needs: [ lint-unit-test-js, unit-test-rust, lint-rust, lint-rust-dependencies, test-multi-os, test-with-svc, test-aws-lambda, test-publish ]
steps:
- name: Checkout sources
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
Expand Down
16 changes: 7 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,12 @@ start-ssl-cert: (docker-up 'db-ssl-cert') docker-is-ready
stop:
{{dockercompose}} down --remove-orphans

# runs cargo-shear to lint Rust dependencies
shear:
cargo shear --expand
# in the future: add --deny-warnings
# https://github.com/Boshen/cargo-shear/pull/386

# Run all tests using a test database
test: start (test-cargo '--all-targets') test-doc test-frontend test-int

Expand Down
3 changes: 1 addition & 2 deletions martin-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ sprites = [
"dep:futures",
"dep:dashmap",
]
styles = ["dep:walkdir", "tokio/fs", "dep:dashmap"]
styles = ["tokio/fs", "dep:dashmap"]
mbtiles = ["dep:mbtiles", "_tiles"]
pmtiles = ["dep:pmtiles", "dep:object_store", "_tiles"]
_tiles = ["dep:base64"]
Expand Down Expand Up @@ -92,7 +92,6 @@ tiff = { workspace = true, optional = true }
tilejson.workspace = true
tokio = { workspace = true, optional = true }
tokio-postgres-rustls = { workspace = true, optional = true }
walkdir = { workspace = true, optional = true }
xxhash-rust.workspace = true

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion martin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ static-files = { workspace = true, optional = true }
walkdir = { workspace = true, optional = true }

[dev-dependencies]
approx.workspace = true
criterion.workspace = true
ctor.workspace = true
indoc.workspace = true
Expand Down
Loading