Skip to content

Commit e9b8346

Browse files
fix(meshix-cli): point pkgbuild at mono releases
1 parent f47eff8 commit e9b8346

4 files changed

Lines changed: 30 additions & 15 deletions

File tree

meshix-cli-bin/.SRCINFO

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pkgbase = meshix-cli-bin
22
pkgdesc = Meshix CLI for run inspection and generation workflows
3-
pkgver = 0.0.2
3+
pkgver = 0.0.5
44
pkgrel = 1
5-
url = https://github.com/shpitdev/meshix-observability
5+
url = https://github.com/shpitdev/meshix-mono
66
install = meshix-cli-bin.install
77
arch = x86_64
88
license = LicenseRef-proprietary

meshix-cli-bin/PKGBUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Maintainer: Anand Pant
22

33
pkgname=meshix-cli-bin
4-
pkgver=0.0.2
4+
pkgver=0.0.5
55
pkgrel=1
66
pkgdesc="Meshix CLI for run inspection and generation workflows"
77
arch=('x86_64')
8-
url="https://github.com/shpitdev/meshix-observability"
8+
url="https://github.com/shpitdev/meshix-mono"
99
license=('LicenseRef-proprietary')
1010
install="${pkgname}.install"
1111
makedepends=('github-cli')
@@ -14,11 +14,11 @@ conflicts=('meshix-cli')
1414

1515
# Public PKGBUILD, private release asset. Users need GitHub access to the shpitdev org.
1616
_asset="meshix-cli_v${pkgver}_linux_amd64.tar.gz"
17-
_sha256='e5446f112d1277cda436d2ecce972b96b409a6fbaf57020690f4a0711d1f06e0'
17+
_sha256='669f98ea36a220b24210f390426eac251eb4707e0bc94bf89fd6195366d703d7'
1818

1919
prepare() {
20-
gh release download "v${pkgver}" \
21-
--repo shpitdev/meshix-observability \
20+
gh release download "meshix-cli-v${pkgver}" \
21+
--repo shpitdev/meshix-mono \
2222
--pattern "${_asset}" \
2323
--dir . --clobber
2424

scripts/update-meshix-cli-bin.sh

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,34 @@ fi
1616

1717
repo_root="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
1818
pkgbuild="${repo_root}/meshix-cli-bin/PKGBUILD"
19-
repo="shpitdev/meshix-observability"
19+
repo="shpitdev/meshix-mono"
2020
requested_version="${MESHIX_CLI_VERSION:-latest}"
2121

22+
normalize_release_tag() {
23+
local version="$1"
24+
25+
if [[ -z "${version}" || "${version}" == "latest" ]]; then
26+
printf 'latest'
27+
return 0
28+
fi
29+
30+
version="${version#meshix-cli-}"
31+
version="${version#v}"
32+
printf 'meshix-cli-v%s' "${version}"
33+
}
34+
2235
resolve_release_json() {
2336
local version="$1"
2437
local endpoint
38+
local release_tag
2539
local output=""
2640

27-
if [[ -z "${version}" || "${version}" == "latest" ]]; then
41+
release_tag="$(normalize_release_tag "${version}")"
42+
43+
if [[ "${release_tag}" == "latest" ]]; then
2844
endpoint="repos/${repo}/releases/latest"
2945
else
30-
if [[ "${version}" != v* ]]; then
31-
version="v${version}"
32-
fi
33-
endpoint="repos/${repo}/releases/tags/${version}"
46+
endpoint="repos/${repo}/releases/tags/${release_tag}"
3447
fi
3548

3649
if [[ -n "${SHPIT_GH_TOKEN:-}" ]]; then
@@ -62,7 +75,9 @@ release_json="$(resolve_release_json "${requested_version}")"
6275
if [[ "${release_json}" == "__SKIP__" ]]; then
6376
exit 0
6477
fi
65-
pkgver="$(jq -r '.tag_name | ltrimstr("v")' <<<"${release_json}")"
78+
tag_name="$(jq -r '.tag_name' <<<"${release_json}")"
79+
pkgver="${tag_name#meshix-cli-v}"
80+
pkgver="${pkgver#v}"
6681
asset_json="$(jq -c '
6782
.assets
6883
| map(select(.name | test("_linux_amd64\\.tar\\.gz$")))

scripts/validate-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ done
1111

1212
meshix_pkg="${repo_root}/meshix-cli-bin"
1313
if [[ -f "${meshix_pkg}/PKGBUILD" ]]; then
14-
grep -q 'gh release download "v${pkgver}"' "${meshix_pkg}/PKGBUILD"
14+
grep -q 'gh release download "meshix-cli-v${pkgver}"' "${meshix_pkg}/PKGBUILD"
1515
grep -q 'install="${pkgname}\.install"' "${meshix_pkg}/PKGBUILD"
1616
grep -q 'meshix-cli-dev' "${meshix_pkg}/meshix-cli-bin.install"
1717
fi

0 commit comments

Comments
 (0)