fix(installer): include prover in prerelease bundle

Signed-off-by: Drew Newberry <anewberry@nvidia.com>

Author: drew

.github/workflows/release-tag.yml

@@ -545,9 +545,11 @@ jobs:
             release/openshell-aarch64-apple-darwin.tar.gz
             release/openshell-gateway-aarch64-apple-darwin.tar.gz
             release/openshell-driver-vm-aarch64-apple-darwin.tar.gz
+            release/openshell-prover-aarch64-apple-darwin.tar.gz
             release/openshell.rb
             release/openshell-checksums-sha256.txt
             release/openshell-gateway-checksums-sha256.txt
+            release/openshell-prover-checksums-sha256.txt
           retention-days: 90
           if-no-files-found: error
 

install.sh

@@ -22,6 +22,7 @@ HOMEBREW_FORMULA_NAME="openshell"
 HOMEBREW_CLI_ASSET="openshell-aarch64-apple-darwin.tar.gz"
 HOMEBREW_GATEWAY_ASSET="openshell-gateway-aarch64-apple-darwin.tar.gz"
 HOMEBREW_DRIVER_VM_ASSET="openshell-driver-vm-aarch64-apple-darwin.tar.gz"
+HOMEBREW_PROVER_ASSET="openshell-prover-aarch64-apple-darwin.tar.gz"
 BREAKING_RELEASE_VERSION="0.0.37"
 LINUX_PACKAGE_GLIBC_MIN_VERSION="2.28"
 UPGRADE_NOTICE_ACK="${OPENSHELL_ACK_BREAKING_UPGRADE:-}"
@@ -400,8 +401,8 @@ resolve_latest_prerelease_tag() {
     /^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, "\\.")
+      split(tag, version_parts, "-pre[.]")
+      split(version_parts[1], core, "[.]")
       sequence = version_parts[2] + 0
 
       if (!found || core[1] + 0 > major ||
@@ -839,7 +840,7 @@ patch_prerelease_homebrew_formula_urls() {
   _formula_file="$1"
   [ -n "$RELEASE_ASSET_DIR" ] || return 0
 
-  for _asset in "$HOMEBREW_CLI_ASSET" "$HOMEBREW_GATEWAY_ASSET" "$HOMEBREW_DRIVER_VM_ASSET"; do
+  for _asset in "$HOMEBREW_CLI_ASSET" "$HOMEBREW_GATEWAY_ASSET" "$HOMEBREW_DRIVER_VM_ASSET" "$HOMEBREW_PROVER_ASSET"; do
     if [ ! -f "${RELEASE_ASSET_DIR}/${_asset}" ]; then
       error "prerelease artifact is missing the required macOS asset: ${_asset}"
     fi
@@ -852,6 +853,7 @@ patch_prerelease_homebrew_formula_urls() {
     -e "s#${_release_asset_url}/${HOMEBREW_CLI_ASSET}#${_local_asset_url}/${HOMEBREW_CLI_ASSET}#g" \
     -e "s#${_release_asset_url}/${HOMEBREW_GATEWAY_ASSET}#${_local_asset_url}/${HOMEBREW_GATEWAY_ASSET}#g" \
     -e "s#${_release_asset_url}/${HOMEBREW_DRIVER_VM_ASSET}#${_local_asset_url}/${HOMEBREW_DRIVER_VM_ASSET}#g" \
+    -e "s#${_release_asset_url}/${HOMEBREW_PROVER_ASSET}#${_local_asset_url}/${HOMEBREW_PROVER_ASSET}#g" \
     "$_formula_file" >"$_patched_file"
   mv "$_patched_file" "$_formula_file"
 }

python/openshell/release_formula_test.py

@@ -60,7 +60,7 @@ def test_generate_homebrew_formula_uses_channel_urls_and_exact_version(
     assert 'sha256 "' + "b" * 64 + '"' in formula
     assert (
         "https://github.com/NVIDIA/OpenShell/releases/download/"
-        "v0.0.10/openshell-prover-aarch64-apple-darwin.tar.gz"
+        "v0.1.0-pre.3/openshell-prover-aarch64-apple-darwin.tar.gz"
     ) in formula
     assert 'sha256 "' + "e" * 64 + '"' in formula
     assert 'resource("openshell-prover").stage' in formula

tasks/scripts/test-install-sh.sh

@@ -228,17 +228,18 @@ if [ "$(cat "$downloaded_checksum")" != "checksums" ]; then
   exit 1
 fi
 
-for asset in "$HOMEBREW_CLI_ASSET" "$HOMEBREW_GATEWAY_ASSET" "$HOMEBREW_DRIVER_VM_ASSET"; do
+for asset in "$HOMEBREW_CLI_ASSET" "$HOMEBREW_GATEWAY_ASSET" "$HOMEBREW_DRIVER_VM_ASSET" "$HOMEBREW_PROVER_ASSET"; do
   : >"${RELEASE_ASSET_DIR}/${asset}"
 done
 prerelease_formula="${tmpdir}/openshell.rb"
 printf '%s\n' \
   "  url \"${GITHUB_URL}/releases/download/${RELEASE_TAG}/${HOMEBREW_CLI_ASSET}\"" \
   "    url \"${GITHUB_URL}/releases/download/${RELEASE_TAG}/${HOMEBREW_GATEWAY_ASSET}\"" \
   "    url \"${GITHUB_URL}/releases/download/${RELEASE_TAG}/${HOMEBREW_DRIVER_VM_ASSET}\"" \
+  "    url \"${GITHUB_URL}/releases/download/${RELEASE_TAG}/${HOMEBREW_PROVER_ASSET}\"" \
   >"$prerelease_formula"
 patch_prerelease_homebrew_formula_urls "$prerelease_formula"
-for asset in "$HOMEBREW_CLI_ASSET" "$HOMEBREW_GATEWAY_ASSET" "$HOMEBREW_DRIVER_VM_ASSET"; do
+for asset in "$HOMEBREW_CLI_ASSET" "$HOMEBREW_GATEWAY_ASSET" "$HOMEBREW_DRIVER_VM_ASSET" "$HOMEBREW_PROVER_ASSET"; do
   if ! grep -Fq "file://${RELEASE_ASSET_DIR}/${asset}" "$prerelease_formula"; then
     echo "FAIL: prerelease formula did not use local asset ${asset}" >&2
     exit 1