Use chmod +x in packaging, move homebrew to 9.1

maplibre · Oct 11, 2023 · 58d691d · 58d691d
1 parent 2817990
commit 58d691d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git 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
diff --git a/HomebrewFormula/martin.rb b/HomebrewFormula/martin.rb
@@ -1,22 +1,23 @@
 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
 
   version "#{current_version}"
 
   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