fix(release): remove dev dry-run scaffolding

Author: pimlock

.github/workflows/release-dev.yml

@@ -4,12 +4,6 @@ on:
   push:
     branches: [main]
   workflow_dispatch:
-    inputs:
-      publish-dev-release:
-        description: "Update :dev images, the dev GitHub release, Helm chart, and wheel publishing"
-        required: false
-        type: boolean
-        default: false
 
 permissions:
   contents: write
@@ -83,7 +77,6 @@ jobs:
   tag-ghcr-dev:
     name: Tag GHCR Images as Dev
     needs: [build-gateway, build-supervisor]
-    if: github.event_name == 'push' || inputs['publish-dev-release']
     runs-on: linux-amd64-cpu8
     timeout-minutes: 10
     steps:
@@ -834,7 +827,6 @@ jobs:
           cat release/openshell.rb
 
       - name: Attest VM driver artifacts
-        if: github.event_name == 'push' || inputs['publish-dev-release']
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4
         with:
           subject-path: |
@@ -843,7 +835,6 @@ jobs:
             release/openshell-driver-vm-aarch64-apple-darwin.tar.gz
 
       - name: Prune managed assets from dev release
-        if: github.event_name == 'push' || inputs['publish-dev-release']
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
         with:
           script: |
@@ -892,15 +883,13 @@ jobs:
             core.info(`Summary: deleted=${deleted}, skipped=${skipped}`);
 
       - name: Move dev tag
-        if: github.event_name == 'push' || inputs['publish-dev-release']
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
           git tag -fa dev -m "Latest Dev" "${GITHUB_SHA}"
           git push --force origin dev
 
       - name: Create / update GitHub Release
-        if: github.event_name == 'push' || inputs['publish-dev-release']
         uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # v3.0.0
         with:
           name: OpenShell Development Build
@@ -939,18 +928,9 @@ jobs:
             release/openshell-gateway-checksums-sha256.txt
             release/openshell-sandbox-checksums-sha256.txt
 
-      - name: Upload dry-run dev release artifacts
-        if: github.event_name == 'workflow_dispatch' && !inputs['publish-dev-release']
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        with:
-          name: dev-release-dry-run-artifacts
-          path: release/
-          retention-days: 5
-
   release-helm:
     name: Release Helm Chart (OCI, dev)
     needs: [tag-ghcr-dev]
-    if: github.event_name == 'push' || inputs['publish-dev-release']
     runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
@@ -968,7 +948,6 @@ jobs:
   trigger-wheel-publish:
     name: Trigger Wheel Publish
     needs: [compute-versions, release-dev]
-    if: github.event_name == 'push' || inputs['publish-dev-release']
     runs-on: [self-hosted, nv]
     timeout-minutes: 10
     steps:

install.sh

@@ -169,38 +169,30 @@ ldd_version_output() {
 }
 
 detect_glibc_version() {
-  _getconf_output="$(getconf_gnu_libc_version 2>/dev/null || true)"
-  case "$_getconf_output" in
-    glibc\ [0-9]*.[0-9]*)
-      printf '%s\n' "${_getconf_output#glibc }"
-      return 0
-      ;;
-    *[Mm][Uu][Ss][Ll]* | *[Aa][Ll][Pp][Ii][Nn][Ee]*)
-      return 2
-      ;;
-  esac
-
   _ldd_output="$(ldd_version_output 2>&1 || true)"
   case "$_ldd_output" in
     *[Mm][Uu][Ss][Ll]* | *[Aa][Ll][Pp][Ii][Nn][Ee]*)
       return 2
       ;;
   esac
 
-  # uv's installer parses the glibc version from the first ldd line's final field.
-  _ldd_version="$(printf '%s\n' "$_ldd_output" | awk 'FNR == 1 { print $NF; exit }')"
-  case "$_ldd_version" in
-    [0-9]*.[0-9]*)
-      ;;
-    *)
-      _ldd_version=""
-      ;;
-  esac
+  _ldd_version="$(printf '%s\n' "$_ldd_output" | awk 'FNR == 1 && match($NF, /^[0-9]+\.[0-9]+/) { print substr($NF, RSTART, RLENGTH); exit }')"
   if [ -n "$_ldd_version" ]; then
     printf '%s\n' "$_ldd_version"
     return 0
   fi
 
+  _getconf_output="$(getconf_gnu_libc_version 2>/dev/null || true)"
+  case "$_getconf_output" in
+    glibc\ [0-9]*.[0-9]*)
+      printf '%s\n' "${_getconf_output#glibc }"
+      return 0
+      ;;
+    *[Mm][Uu][Ss][Ll]* | *[Aa][Ll][Pp][Ii][Nn][Ee]*)
+      return 2
+      ;;
+  esac
+
   return 1
 }
 

tasks/scripts/stage-prebuilt-binaries.sh

@@ -122,18 +122,15 @@ patch_workspace_version() {
 
   cargo_toml="${ROOT}/Cargo.toml"
   cargo_toml_backup="$(mktemp)"
-  cargo_toml_patched="$(mktemp)"
   cp "$cargo_toml" "$cargo_toml_backup"
   restore_cargo_toml=1
-  sed -E '/^\[workspace\.package\]/,/^\[/{s/^version[[:space:]]*=[[:space:]]*".*"/version = "'"${OPENSHELL_CARGO_VERSION}"'"/}' "$cargo_toml" > "$cargo_toml_patched"
-  mv "$cargo_toml_patched" "$cargo_toml"
+  sed -i -E '/^\[workspace\.package\]/,/^\[/{s/^version[[:space:]]*=[[:space:]]*".*"/version = "'"${OPENSHELL_CARGO_VERSION}"'"/}' "$cargo_toml"
 }
 
 restore_workspace_version() {
   if [[ "${restore_cargo_toml:-0}" == "1" ]]; then
     cp "$cargo_toml_backup" "$cargo_toml"
     rm -f "$cargo_toml_backup"
-    rm -f "${cargo_toml_patched:-}"
   fi
 }
 

tasks/scripts/test-install-sh.sh

@@ -16,9 +16,9 @@ export OPENSHELL_INSTALL_SH_TEST=1
 
 assert_glibc_preflight_passes() {
   local name=$1
-  local getconf_output=$2
+  local ldd_output=$2
 
-  if ! (export OPENSHELL_TEST_GETCONF_OUTPUT="$getconf_output"; require_linux_package_glibc) >"$out" 2>"$err"; then
+  if ! (export OPENSHELL_TEST_GETCONF_UNAVAILABLE=1 OPENSHELL_TEST_LDD_OUTPUT="$ldd_output"; require_linux_package_glibc) >"$out" 2>"$err"; then
     echo "FAIL: ${name}" >&2
     cat "$err" >&2 || true
     exit 1
@@ -45,7 +45,8 @@ assert_glibc_preflight_fails() {
 }
 
 setup_glibc_228() {
-  export OPENSHELL_TEST_GETCONF_OUTPUT="glibc 2.28"
+  export OPENSHELL_TEST_GETCONF_UNAVAILABLE=1
+  export OPENSHELL_TEST_LDD_OUTPUT="ldd (GNU libc) 2.28"
 }
 
 setup_missing_glibc() {
@@ -54,6 +55,7 @@ setup_missing_glibc() {
 }
 
 setup_getconf_musl() {
+  export OPENSHELL_TEST_LDD_UNAVAILABLE=1
   export OPENSHELL_TEST_GETCONF_OUTPUT="musl libc"
 }
 
@@ -63,10 +65,16 @@ setup_ldd_musl() {
 }
 
 assert_glibc_preflight_passes "glibc 2.31 passes" "glibc 2.31"
-assert_glibc_preflight_passes "glibc 2.35 passes" "glibc 2.35"
+assert_glibc_preflight_passes "glibc 2.35 passes" "ldd (GNU libc) 2.35"
+
+if ! (export OPENSHELL_TEST_LDD_UNAVAILABLE=1 OPENSHELL_TEST_GETCONF_OUTPUT="glibc 2.35"; require_linux_package_glibc) >"$out" 2>"$err"; then
+  echo "FAIL: getconf glibc fallback passes" >&2
+  cat "$err" >&2 || true
+  exit 1
+fi
 
-if ! (export OPENSHELL_TEST_GETCONF_UNAVAILABLE=1 OPENSHELL_TEST_LDD_OUTPUT="ldd (GNU libc) 2.35"; require_linux_package_glibc) >"$out" 2>"$err"; then
-  echo "FAIL: ldd glibc fallback passes" >&2
+if ! (export OPENSHELL_TEST_LDD_OUTPUT="not ldd" OPENSHELL_TEST_GETCONF_OUTPUT="glibc 2.35"; require_linux_package_glibc) >"$out" 2>"$err"; then
+  echo "FAIL: unparseable ldd output falls back to getconf" >&2
   cat "$err" >&2 || true
   exit 1
 fi