From 0c821aec47c97ae7a0980904403545e461a26adc Mon Sep 17 00:00:00 2001 From: Anand Pant Date: Mon, 11 May 2026 02:29:56 -0500 Subject: [PATCH] fix(meshix-cli): point formula at mono releases --- Formula/meshix-cli.rb | 12 +++++------ Formula/osyrra.rb | 8 ++++---- scripts/update-meshix-cli.sh | 39 +++++++++++++++++++++++++----------- scripts/validate-formulae.sh | 2 +- 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/Formula/meshix-cli.rb b/Formula/meshix-cli.rb index 1c46393..dacf1b1 100644 --- a/Formula/meshix-cli.rb +++ b/Formula/meshix-cli.rb @@ -64,17 +64,17 @@ def curl(*args, print_stdout: true, **options) class MeshixCli < Formula desc "Meshix CLI for run inspection and generation workflows" - homepage "https://github.com/shpitdev/meshix-observability" - version "0.0.2" + homepage "https://github.com/shpitdev/meshix-mono" + version "0.0.5" license :cannot_represent depends_on arch: :arm64 on_macos do on_arm do - url "https://api.github.com/repos/shpitdev/meshix-observability/releases/assets/401891227", + url "https://api.github.com/repos/shpitdev/meshix-mono/releases/assets/417231484", using: MeshixCliGitHubReleaseDownloadStrategy, - resolved_basename: "meshix-cli_v0.0.2_darwin_arm64.tar.gz" - sha256 "f80902fc7a8b83b4b7a777136271b84e954b3d808a8c1f412dfb8c9ac88a3700" + resolved_basename: "meshix-cli_v0.0.5_darwin_arm64.tar.gz" + sha256 "0f717d482ac8efdce7772384704974827ab8049e0bce57df408e9e23ef118a3b" end end @@ -95,6 +95,6 @@ def caveats test do output = shell_output("#{bin}/meshix-cli --help") assert_match "meshix-cli", output - assert_match "architecture", output + assert_match "generate", output end end diff --git a/Formula/osyrra.rb b/Formula/osyrra.rb index 40cbcc4..45d3740 100644 --- a/Formula/osyrra.rb +++ b/Formula/osyrra.rb @@ -65,16 +65,16 @@ def curl(*args, print_stdout: true, **options) class Osyrra < Formula desc "Osyrra silent email worker and operator TUI" homepage "https://github.com/shpitdev/osyrra" - version "0.0.12" + version "0.0.14" license :cannot_represent depends_on arch: :arm64 on_macos do on_arm do - url "https://api.github.com/repos/shpitdev/osyrra/releases/assets/413741700", + url "https://api.github.com/repos/shpitdev/osyrra/releases/assets/417231933", using: OsyrraGitHubReleaseDownloadStrategy, - resolved_basename: "osyrra_v0.0.12_darwin_arm64.tar.gz" - sha256 "89a6e3e9f55f5272f515ebeb2e3ea7ab4632fa5106632261ff3f7b9126499ab6" + resolved_basename: "osyrra_v0.0.14_darwin_arm64.tar.gz" + sha256 "426ba44f52a3f758ca7b5bfcd471fa7f7d9baf43d55d4b27693291fa7638f4b9" end end diff --git a/scripts/update-meshix-cli.sh b/scripts/update-meshix-cli.sh index 3024b44..3ae5600 100755 --- a/scripts/update-meshix-cli.sh +++ b/scripts/update-meshix-cli.sh @@ -16,7 +16,7 @@ fi repo_root="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)" formula_path="${repo_root}/Formula/meshix-cli.rb" -repo="shpitdev/meshix-observability" +repo="shpitdev/meshix-mono" requested_version="${MESHIX_CLI_VERSION:-latest}" verify_sha256() { @@ -39,18 +39,31 @@ verify_sha256() { fi } +normalize_release_tag() { + local version="$1" + + if [[ -z "${version}" || "${version}" == "latest" ]]; then + printf 'latest' + return 0 + fi + + version="${version#meshix-cli-}" + version="${version#v}" + printf 'meshix-cli-v%s' "${version}" +} + resolve_release_json() { local version="$1" local endpoint + local release_tag local output="" - if [[ -z "${version}" || "${version}" == "latest" ]]; then + release_tag="$(normalize_release_tag "${version}")" + + if [[ "${release_tag}" == "latest" ]]; then endpoint="repos/${repo}/releases/latest" else - if [[ "${version}" != v* ]]; then - version="v${version}" - fi - endpoint="repos/${repo}/releases/tags/${version}" + endpoint="repos/${repo}/releases/tags/${release_tag}" fi if [[ -n "${SHPIT_GH_TOKEN:-}" ]]; then @@ -82,7 +95,9 @@ release_json="$(resolve_release_json "${requested_version}")" if [[ "${release_json}" == "__SKIP__" ]]; then exit 0 fi -version="$(jq -r '.tag_name | ltrimstr("v")' <<<"${release_json}")" +tag_name="$(jq -r '.tag_name' <<<"${release_json}")" +version="${tag_name#meshix-cli-v}" +version="${version#v}" arm64_json="$(jq -c ' .assets | map(select(.name | test("_darwin_arm64\\.tar\\.gz$"))) @@ -117,17 +132,17 @@ tmpdir="$(mktemp -d)" trap 'rm -rf "${tmpdir}"' EXIT if [[ -n "${SHPIT_GH_TOKEN:-}" ]]; then - GH_TOKEN="${SHPIT_GH_TOKEN}" gh release download "v${version}" --repo "${repo}" \ + GH_TOKEN="${SHPIT_GH_TOKEN}" gh release download "${tag_name}" --repo "${repo}" \ --pattern "${arm64_asset}" --dir "${tmpdir}" --clobber >/dev/null else - gh release download "v${version}" --repo "${repo}" \ + gh release download "${tag_name}" --repo "${repo}" \ --pattern "${arm64_asset}" --dir "${tmpdir}" --clobber >/dev/null fi ( cd "${tmpdir}" verify_sha256 "${arm64_sha}" "${arm64_asset}" - tar -tzf "${arm64_asset}" | grep -qx "meshix-cli_v${version}_darwin_arm64/meshix-cli" + tar -tzf "${arm64_asset}" | grep -qx "${arm64_asset%.tar.gz}/meshix-cli" ) cat > "${formula_path}" <