mirror of
https://github.com/NVIDIA/OpenShell.git
synced 2026-10-02 07:34:45 +08:00
fix(install): honor pinned releases and speed up prerelease discovery (#3681)
* fix(install): use native packages for prereleases and speed up discovery Signed-off-by: Drew Newberry <anewberry@nvidia.com> * fix(install): honor pinned versions and guard Snap migration Signed-off-by: Drew Newberry <anewberry@nvidia.com> * fix(install): omit Snap migration guard Signed-off-by: Drew Newberry <anewberry@nvidia.com> --------- Signed-off-by: Drew Newberry <anewberry@nvidia.com>
This commit is contained in:
Drew Newberry
+52
-68
@@ -66,14 +66,16 @@ NOTES:
|
||||
When OPENSHELL_VERSION is unset, this resolves the latest tagged release
|
||||
from ${GITHUB_URL}/releases/latest.
|
||||
|
||||
On Linux, the installer uses the OpenShell snap whenever the snap command
|
||||
is available. It installs from latest/edge when OPENSHELL_VERSION=dev and
|
||||
from latest/stable otherwise. The OpenShell snap requires a running Docker
|
||||
Engine installed from a system package or Docker's package repository. The
|
||||
Docker snap is not currently compatible with OpenShell.
|
||||
On Linux, the installer uses the OpenShell snap when the snap command is
|
||||
available and OPENSHELL_VERSION is unset or dev. Snap installs use
|
||||
latest/stable by default and latest/edge for dev. Explicit release tags
|
||||
and prereleases use Debian or RPM packages. The OpenShell snap requires a
|
||||
running Docker Engine installed from a system package or Docker's package
|
||||
repository. The Docker snap is not currently compatible with OpenShell.
|
||||
|
||||
Without snap, Linux installs the Debian package on amd64/arm64 or the RPM
|
||||
packages on x86_64/aarch64, depending on the host package manager.
|
||||
For explicit versions or without snap, Linux installs the Debian package
|
||||
on amd64/arm64 or the RPM packages on x86_64/aarch64, depending on the
|
||||
host package manager.
|
||||
macOS installs the release Homebrew formula on Apple Silicon and starts a
|
||||
brew services-backed local gateway.
|
||||
EOF
|
||||
@@ -432,61 +434,39 @@ resolve_latest_prerelease_tag() {
|
||||
|
||||
info "resolving latest prerelease..."
|
||||
_artifact_platform="$(prerelease_artifact_platform)"
|
||||
_successful_run_ids="$(gh api --paginate \
|
||||
"repos/${REPO}/actions/workflows/release-tag.yml/runs?status=success&per_page=100" \
|
||||
--jq '.workflow_runs[] | select(.status == "completed" and .conclusion == "success") | .id')" || {
|
||||
error "failed to list successful Release Tag workflow runs"
|
||||
_release_tags="$(gh api "repos/${REPO}/git/matching-refs/tags/v" --jq '
|
||||
[.[].ref | sub("^refs/tags/"; "") |
|
||||
select(test("^v[0-9]+\\.[0-9]+\\.[0-9]+-pre\\.[1-9][0-9]*$"))] |
|
||||
sort_by(split("-pre.") as $parts |
|
||||
($parts[0] | ltrimstr("v") | split(".") | map(tonumber)) +
|
||||
[($parts[1] | tonumber)]) | reverse | .[]')" || {
|
||||
error "failed to list prerelease tags"
|
||||
}
|
||||
_artifact_records="$(gh api --paginate \
|
||||
"repos/${REPO}/actions/artifacts?per_page=100" \
|
||||
--jq '.artifacts[] | select(.expired == false) | [.workflow_run.id, .name] | @tsv')" || {
|
||||
error "failed to list prerelease artifacts"
|
||||
}
|
||||
_artifact_names="$(printf '%s\n--ARTIFACTS--\n%s\n' "$_successful_run_ids" "$_artifact_records" | awk -F '\t' '
|
||||
$0 == "--ARTIFACTS--" {
|
||||
reading_artifacts = 1
|
||||
next
|
||||
}
|
||||
!reading_artifacts {
|
||||
if ($1 ~ /^[0-9]+$/) successful_runs[$1] = 1
|
||||
next
|
||||
}
|
||||
$1 in successful_runs {
|
||||
print $2
|
||||
}
|
||||
')"
|
||||
_release_tags="$(printf '%s\n' "$_artifact_names" | sed -n "s/^openshell-\(v[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-pre\.[1-9][0-9]*\)-${_artifact_platform}$/\1/p" | sort -u)"
|
||||
|
||||
_latest_prerelease="$(printf '%s\n' "$_release_tags" | awk '
|
||||
/^v[0-9]+\.[0-9]+\.[0-9]+-pre\.[1-9][0-9]*$/ {
|
||||
tag = $0
|
||||
sub(/^v/, "", tag)
|
||||
split(tag, version_parts, "-pre[.]")
|
||||
split(version_parts[1], core, "[.]")
|
||||
sequence = version_parts[2] + 0
|
||||
for _tag in $_release_tags; do
|
||||
_artifact_name="openshell-${_tag}-${_artifact_platform}"
|
||||
info "checking ${_tag} for ${_artifact_platform}..."
|
||||
_run_ids="$(gh api \
|
||||
"repos/${REPO}/actions/artifacts?name=${_artifact_name}&per_page=100" \
|
||||
--jq '[.artifacts[] | select(.expired == false)] |
|
||||
sort_by(.created_at) | reverse | .[] | .workflow_run.id')" || {
|
||||
error "failed to find prerelease artifact ${_artifact_name}"
|
||||
}
|
||||
|
||||
if (!found || core[1] + 0 > major ||
|
||||
(core[1] + 0 == major && core[2] + 0 > minor) ||
|
||||
(core[1] + 0 == major && core[2] + 0 == minor && core[3] + 0 > patch) ||
|
||||
(core[1] + 0 == major && core[2] + 0 == minor && core[3] + 0 == patch && sequence > prerelease)) {
|
||||
selected = $0
|
||||
major = core[1] + 0
|
||||
minor = core[2] + 0
|
||||
patch = core[3] + 0
|
||||
prerelease = sequence
|
||||
found = 1
|
||||
for _run_id in $_run_ids; do
|
||||
_successful="$(gh api "repos/${REPO}/actions/runs/${_run_id}" --jq '
|
||||
.status == "completed" and .conclusion == "success" and
|
||||
(.path | startswith(".github/workflows/release-tag.yml"))')" || {
|
||||
error "failed to check prerelease workflow run ${_run_id}"
|
||||
}
|
||||
}
|
||||
END {
|
||||
if (found) print selected
|
||||
}
|
||||
')"
|
||||
if [ "$_successful" = "true" ]; then
|
||||
printf '%s\n' "$_tag"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
if [ -z "$_latest_prerelease" ]; then
|
||||
error "no unexpired prerelease artifacts found"
|
||||
fi
|
||||
|
||||
printf '%s\n' "$_latest_prerelease"
|
||||
error "no unexpired prerelease artifacts found"
|
||||
}
|
||||
|
||||
is_prerelease_tag() {
|
||||
@@ -678,9 +658,16 @@ local_gateway_endpoint() {
|
||||
}
|
||||
|
||||
linux_package_method() {
|
||||
if has_cmd snap; then
|
||||
echo "snap"
|
||||
elif has_cmd dpkg; then
|
||||
case "${OPENSHELL_VERSION:-}" in
|
||||
'' | dev)
|
||||
if has_cmd snap; then
|
||||
echo "snap"
|
||||
return 0
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
if has_cmd dpkg; then
|
||||
echo "deb"
|
||||
elif has_cmd rpm; then
|
||||
echo "rpm"
|
||||
@@ -1226,14 +1213,11 @@ install_linux_rpm() {
|
||||
}
|
||||
|
||||
openshell_snap_channel() {
|
||||
if [ "${OPENSHELL_VERSION:-}" = "dev" ]; then
|
||||
printf '%s\n' "latest/edge"
|
||||
else
|
||||
if [ -n "${OPENSHELL_VERSION:-}" ]; then
|
||||
warn "OPENSHELL_VERSION=${OPENSHELL_VERSION} is ignored for Snap installs; using latest/stable"
|
||||
fi
|
||||
printf '%s\n' "latest/stable"
|
||||
fi
|
||||
case "${OPENSHELL_VERSION:-}" in
|
||||
dev) printf '%s\n' "latest/edge" ;;
|
||||
'') printf '%s\n' "latest/stable" ;;
|
||||
*) error "Snap installs do not support OPENSHELL_VERSION=${OPENSHELL_VERSION}; use a native package" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
ensure_snap_gateway_config() {
|
||||
|
||||
Reference in New Issue
Block a user