@stll/oxlint-config 1.2.3 → 1.2.5

package/dist/toolchain-inputs.mjs

@@ -42,9 +42,11 @@ apt_install() (
   local package
   for package in "$@"; do
     if [[ "$package" == */* ]]; then
-      # apt cannot fetch local archives with --download-only; their installs stay
-      # bounded as a whole (dependencies are normally present already).
-      DEBIAN_FRONTEND=noninteractive apt_network install -y --no-install-recommends "$@"
+      # apt cannot fetch local archives with --download-only, so their installs
+      # stay one call. Package triggers can be slow on cloud filesystems; the
+      # longer whole-call deadline covers them while Acquire timeouts still
+      # bound each network request.
+      APT_DEADLINE=600 DEBIAN_FRONTEND=noninteractive apt_network install -y --no-install-recommends "$@"
       return
     fi
   done
@@ -273,22 +275,33 @@ const renderCloudServiceInstall = ({ services, postgres, valkey, valkeyArtifacts
 //#region src/cloud-setup-network.ts
 /** Shared deadlines cover retries and package-manager subprocesses. */
 const renderCloudNetwork = () => String.raw`
+release_log_holders() {
+  # Processes left by package scripts may still hold a step log after the command exits.
+  # Setup starts its own services later, so end them rather than let them write into a
+  # deleted log for their whole lifetime.
+  # One find over all descriptor links; no process per descriptor.
+  local log="$1" root="${"$"}{CLOUD_PROC_ROOT:-/proc}" fd pid
+  while IFS= read -r fd; do
+    pid="${"$"}{fd%/fd/*}"
+    pid="${"$"}{pid##*/}"
+    [[ "$pid" =~ ^[0-9]+$ && "$pid" != "$$" ]] || continue
+    kill -TERM "$pid" 2>/dev/null || true
+  done < <(find "$root" -mindepth 3 -maxdepth 3 -path "$root/[0-9]*/fd/*" -lname "$log" 2>/dev/null)
+}
 network_run() (
   local host="$1" seconds="$2" status=0
   shift 2
-  set -o pipefail
   network_log="$(mktemp)" || return "$?"
   trap 'rm -f -- "$network_log"' EXIT
   trap 'exit 129' HUP
   trap 'exit 130' INT
   trap 'exit 143' TERM
-  if timeout --signal=TERM --kill-after=5s "$seconds"s "$@" 2>&1 | tee "$network_log"; then
-    return 0
-  else
-    # Scalar Bash array expansion reads PIPESTATUS[0] before assignment resets it.
-    status="$PIPESTATUS"
-  fi
-  [[ "$status" != 0 ]] || fail 'Cannot capture network command output'
+  # Output goes to a file, never a pipe: package scripts may leave processes that keep
+  # inherited descriptors open, and a pipe reader would wait for them past the command.
+  timeout --signal=TERM --kill-after=5s "$seconds"s "$@" > "$network_log" 2>&1 || status=$?
+  release_log_holders "$network_log"
+  cat -- "$network_log" || fail 'Cannot capture network command output'
+  [[ "$status" != 0 ]] || return 0
   if [[ "$status" == 124 || "$status" == 137 || "$status" == 28 ]] || grep -Eiq 'timed[[:space:]-]+out|time[[:space:]-]+out|timeout[[:space:]]+(was[[:space:]]+)?(reached|expired)|(connection|operation|socket)[[:space:]-]+timeout' "$network_log"; then
     fail "download timed out: $host"
   fi
@@ -305,7 +318,8 @@ apt_network() {
   # --print-uris reads configured indexes without contacting their servers.
   hosts="$(set -o pipefail; apt-get --print-uris update | awk -F/ '/^\047https?:\/\// { host=$3; sub(/.*@/, "", host); if (!seen[host]++) { printf "%s%s", separator, host; separator="," } }')" || return "$?"
   [[ -n "$hosts" ]] || hosts='configured APT hosts'
-  network_run "$hosts" 180 apt-get -o Acquire::http::Timeout=20 -o Acquire::https::Timeout=20 -o Acquire::Retries=3 -o APT::Update::Error-Mode=any "$@"
+  # APT_DEADLINE: whole-call seconds; callers that also unpack packages may extend it.
+  network_run "$hosts" "${"$"}{APT_DEADLINE:-180}" apt-get -o Acquire::http::Timeout=20 -o Acquire::https::Timeout=20 -o Acquire::Retries=3 -o APT::Update::Error-Mode=any "$@"
 }
 apt_refresh_for() {
   # Skip the refresh only when the install downloads nothing: then no package