diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a67acba26..aca897934 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -520,7 +520,6 @@ jobs: - target: x86_64-pc-windows-msvc os: windows-latest name: martin-Windows-x86_64.zip - ext: '.exe' - target: x86_64-unknown-linux-gnu os: ubuntu-latest name: martin-Linux-x86_64.tar.gz @@ -554,14 +553,15 @@ jobs: run: | cd target/ if [[ "${{ runner.os }}" == "Windows" ]]; then - 7z a ../${{ matrix.name }} martin${{ matrix.ext }} mbtiles${{ matrix.ext }} + 7z a ../${{ matrix.name }} martin.exe mbtiles.exe elif [[ "${{ matrix.target }}" == "debian-x86_64" ]]; then mv debian-x86_64.deb ../${{ matrix.name }} else if [[ "${{ matrix.cross }}" == "true" ]]; then mv ${{ matrix.target }}/* . fi - tar czvf ../${{ matrix.name }} martin${{ matrix.ext }} mbtiles${{ matrix.ext }} + chmod +x martin mbtiles + tar czvf ../${{ matrix.name }} martin mbtiles fi # TODO: why is this needed and where should the result go? # - name: Generate SHA-256 (MacOS) diff --git a/Cargo.lock b/Cargo.lock index 06a2b0e08..12047afcc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1580,9 +1580,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2379,7 +2379,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.8.0", + "regex-syntax 0.8.1", ] [[package]] @@ -2390,7 +2390,7 @@ checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.0", + "regex-syntax 0.8.1", ] [[package]] @@ -2401,9 +2401,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3cbb081b9784b07cceb8824c8583f86db4814d172ab043f3c23f7dc600bf83d" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "relative-path" @@ -4059,11 +4059,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/HomebrewFormula/martin.rb b/HomebrewFormula/martin.rb index 7c51151d7..3e08cacd7 100644 --- a/HomebrewFormula/martin.rb +++ b/HomebrewFormula/martin.rb @@ -1,15 +1,15 @@ class Martin < Formula - current_version="0.9.0" + current_version="0.9.1" - desc "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support" + desc "Blazing fast and lightweight tile server with PostGIS, MBTiles, and PMTiles support, plus an mbtiles tool" homepage "https://github.com/maplibre/martin" on_arm do - sha256 "d1a64d4707e3f1fdb41b3e445c462465e6150d3b30f7520af262548184a4d08b" + sha256 "00828eb3490664eba767323da98d2847238b65b7bea1e235267e43a67277d8e5" url "https://github.com/maplibre/martin/releases/download/v#{current_version}/martin-Darwin-aarch64.tar.gz" end on_intel do - sha256 "ab581373a9fe699ba8e6640b587669391c6d5901ce816c3acb154f8410775068" + sha256 "75b52bd89ba397267080e938dd261f57c1eabdaa1d27ac13bf4904031672a6e9" url "https://github.com/maplibre/martin/releases/download/v#{current_version}/martin-Darwin-x86_64.tar.gz" end @@ -17,6 +17,7 @@ class Martin < Formula def install bin.install "martin" + bin.install "mbtiles" end def caveats; <<~EOS @@ -28,5 +29,6 @@ def caveats; <<~EOS test do `#{bin}/martin --version` + `#{bin}/mbtiles --version` end end