From 8fadac0e29e201fade05984a15a11f6fbbe68d82 Mon Sep 17 00:00:00 2001 From: sharkAndshark Date: Sat, 18 Nov 2023 11:44:22 +0800 Subject: [PATCH 1/4] Try cargo binstall --- martin/Cargo.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/martin/Cargo.toml b/martin/Cargo.toml index 7a3b01c1b..abbd2f6d3 100644 --- a/martin/Cargo.toml +++ b/martin/Cargo.toml @@ -1,5 +1,16 @@ lints.workspace = true + + +[package.metadata.binstall] +pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ target }-{ archive-suffix }" +bin-dir = "{ name }{ binary-ext }" +pkg-fmt = "tgz" + +[package.metadata.binstall.overrides.x86_64-pc-windows-msvc] +pkg-fmt = "zip" + + [package] name = "martin" # Once the release is published with the hash, update https://github.com/maplibre/homebrew-martin From 4f9c405d4f6c9a6935144818ac32c4a1fdb06197 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 18 Nov 2023 08:22:29 +0000 Subject: [PATCH 2/4] Update releases file names --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a38b4655a..1f762a726 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -546,34 +546,34 @@ jobs: cd aarch64-apple-darwin chmod +x martin mbtiles - tar czvf ../files/martin-Darwin-aarch64.tar.gz martin mbtiles + tar czvf ../files/martin-aarch64-apple-darwin.tar.gz martin mbtiles cd .. cd x86_64-apple-darwin chmod +x martin mbtiles - tar czvf ../files/martin-Darwin-x86_64.tar.gz martin mbtiles + tar czvf ../files/martin-x86_64-apple-darwin.tar.gz martin mbtiles cd .. cd x86_64-unknown-linux-gnu chmod +x martin mbtiles - tar czvf ../files/martin-Linux-x86_64.tar.gz martin mbtiles + tar czvf ../files/martin-x86_64-unknown-linux-gnu.tar.gz martin mbtiles cd .. cd aarch64-unknown-linux-musl chmod +x martin mbtiles - tar czvf ../files/martin-Linux-aarch64-musl.tar.gz martin mbtiles + tar czvf ../files/martin-aarch64-unknown-linux-musl.tar.gz martin mbtiles cd .. cd x86_64-unknown-linux-musl chmod +x martin mbtiles - tar czvf ../files/martin-Linux-x86_64-musl.tar.gz martin mbtiles + tar czvf ../files/martin-x86_64-unknown-linux-musl.tar.gz martin mbtiles cd .. # # Special case for Windows # cd x86_64-pc-windows-msvc - 7z a ../files/martin-Windows-x86_64.zip martin.exe mbtiles.exe + 7z a ../files/martin-x86_64-pc-windows-msvc.zip martin.exe mbtiles.exe cd .. # @@ -595,10 +595,10 @@ jobs: cat << EOF > homebrew_config.yaml version: "$MARTIN_VERSION" - macos_arm_sha256: "$(shasum -a 256 files/martin-Darwin-aarch64.tar.gz | cut -d' ' -f1)" - macos_intel_sha256: "$(shasum -a 256 files/martin-Darwin-x86_64.tar.gz | cut -d' ' -f1)" - linux_arm_sha256: "$(shasum -a 256 files/martin-Linux-aarch64-musl.tar.gz | cut -d' ' -f1)" - linux_intel_sha256: "$(shasum -a 256 files/martin-Linux-x86_64-musl.tar.gz | cut -d' ' -f1)" + macos_arm_sha256: "$(shasum -a 256 files/martin-aarch64-apple-darwin.tar.gz | cut -d' ' -f1)" + macos_intel_sha256: "$(shasum -a 256 files/martin-x86_64-apple-darwin.tar.gz | cut -d' ' -f1)" + linux_arm_sha256: "$(shasum -a 256 files/martin-aarch64-unknown-linux-musl.tar.gz | cut -d' ' -f1)" + linux_intel_sha256: "$(shasum -a 256 files/martin-x86_64-unknown-linux-musl.tar.gz | cut -d' ' -f1)" EOF - name: Save Homebrew Config From 61f92c6da5493f5fb1adc965924002a284733568 Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 18 Nov 2023 08:22:41 +0000 Subject: [PATCH 3/4] Update links --- README.md | 12 ++++++------ docs/src/10-installation.md | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a0055cab6..5ace7cf0e 100755 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ You can download martin from [GitHub releases page](https://github.com/maplibre/ | macOS | [.tar.gz][rl-macos-x64] | [.tar.gz][rl-macos-a64] | | Windows | [.zip][rl-win64-zip] | | -[rl-linux-x64]: https://github.com/maplibre/martin/releases/latest/download/martin-Linux-x86_64.tar.gz -[rl-linux-x64-musl]: https://github.com/maplibre/martin/releases/latest/download/martin-Linux-x86_64-musl.tar.gz +[rl-linux-x64]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-unknown-linux-gnu.tar.gz +[rl-linux-x64-musl]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-unknown-linux-musl.tar.gz [rl-linux-x64-deb]: https://github.com/maplibre/martin/releases/latest/download/martin-Debian-x86_64.deb -[rl-linux-a64-musl]: https://github.com/maplibre/martin/releases/latest/download/martin-Linux-aarch64-musl.tar.gz -[rl-macos-x64]: https://github.com/maplibre/martin/releases/latest/download/martin-Darwin-x86_64.tar.gz -[rl-macos-a64]: https://github.com/maplibre/martin/releases/latest/download/martin-Darwin-aarch64.tar.gz -[rl-win64-zip]: https://github.com/maplibre/martin/releases/latest/download/martin-Windows-x86_64.zip +[rl-linux-a64-musl]: https://github.com/maplibre/martin/releases/latest/download/martin-aarch64-unknown-linux-musl.tar.gz +[rl-macos-x64]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-apple-darwin.tar.gz +[rl-macos-a64]: https://github.com/maplibre/martin/releases/latest/download/martin-aarch64-apple-darwin.tar.gz +[rl-win64-zip]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-pc-windows-msvc.zip If you are using macOS and [Homebrew](https://brew.sh/) you can install `martin` and `mbtiles` using Homebrew tap. diff --git a/docs/src/10-installation.md b/docs/src/10-installation.md index 114cf3807..1fa00d33e 100644 --- a/docs/src/10-installation.md +++ b/docs/src/10-installation.md @@ -12,9 +12,9 @@ You can download martin from [GitHub releases page](https://github.com/maplibre/ | macOS | [64-bit][rl-macos-tar] | | Windows | [64-bit][rl-win64-zip] | -[rl-linux-tar]: https://github.com/maplibre/martin/releases/latest/download/martin-Linux-x86_64.tar.gz -[rl-macos-tar]: https://github.com/maplibre/martin/releases/latest/download/martin-Darwin-x86_64.tar.gz -[rl-win64-zip]: https://github.com/maplibre/martin/releases/latest/download/martin-Windows-x86_64.zip +[rl-linux-tar]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-unknown-linux-gnu.tar.gz +[rl-macos-tar]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-apple-darwin.tar.gz +[rl-win64-zip]: https://github.com/maplibre/martin/releases/latest/download/martin-x86_64-pc-windows-msvc.zip ### Building with Cargo From 86574cb83d07d739ce32bdf954444991cd9b2e7c Mon Sep 17 00:00:00 2001 From: Lucas Date: Sat, 18 Nov 2023 08:30:32 +0000 Subject: [PATCH 4/4] Remove unnecessary temp metadata for test --- martin/Cargo.toml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/martin/Cargo.toml b/martin/Cargo.toml index abbd2f6d3..7a3b01c1b 100644 --- a/martin/Cargo.toml +++ b/martin/Cargo.toml @@ -1,16 +1,5 @@ lints.workspace = true - - -[package.metadata.binstall] -pkg-url = "{ repo }/releases/download/v{ version }/{ name }-{ target }-{ archive-suffix }" -bin-dir = "{ name }{ binary-ext }" -pkg-fmt = "tgz" - -[package.metadata.binstall.overrides.x86_64-pc-windows-msvc] -pkg-fmt = "zip" - - [package] name = "martin" # Once the release is published with the hash, update https://github.com/maplibre/homebrew-martin