Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In deb package, include ssl and mbtiles tool #895

Merged
merged 1 commit into from
Sep 26, 2023
Merged

In deb package, include ssl and mbtiles tool #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
rm -rf target
env:
DATABASE_URL: ${{ steps.pg.outputs.connection-uri }}
- name: Download build result
- name: Download build artifact build-${{ matrix.target }}
uses: actions/download-artifact@v3
with:
name: build-${{ matrix.target }}
Expand Down Expand Up @@ -308,8 +308,8 @@ jobs:
- target: aarch64-apple-darwin
os: ubuntu-latest
name: martin-Darwin-aarch64.tar.gz
sha: 'true'
cross: 'true'
sha: 'true'
- target: aarch64-unknown-linux-gnu
os: ubuntu-latest
name: martin-Linux-aarch64.tar.gz
Expand All @@ -332,7 +332,8 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v4
- uses: actions/download-artifact@v3
- name: Download build artifact build-${{ matrix.target }}
uses: actions/download-artifact@v3
with:
name: build-${{ matrix.target }}
path: target/
Expand Down
9 changes: 6 additions & 3 deletions martin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ homepage.workspace = true

[package.metadata.deb]
name = "martin"
maintainer = "Stepan Kuzmin <[email protected]>, Yuri Astrakhan <[email protected]>, MapLibre contributors"
depends = "$auto"
revision = ""
maintainer = "Yuri Astrakhan <[email protected]>, Stepan Kuzmin <[email protected]>, MapLibre contributors"
maintainer-scripts = "../debian"
depends = "$auto"
features = ["ssl"]
assets = [
["target/release/martin", "/usr/bin/martin", "755"],
["../README.md","/usr/share/doc/martin/README.md","644"],
["target/release/mbtiles", "/usr/bin/mbtiles", "755"],
["../README.md", "/usr/share/doc/martin/README.md", "644"],
["../debian/config.yaml", "/usr/share/doc/martin/config.yaml", "644"],
["../debian/config.yaml", "/usr/local/etc/martin/config.yaml", "644"],
]
Expand Down