chore(ci): install vdev via --manifest-path; drop VDEV_VERSION pin (#25456)

Co-authored-by: Pavlos Rontidis <pavlos.rontidis@gmail.com>

Author: thomasqueirozb

.github/actions/setup/action.yml

@@ -73,7 +73,7 @@ inputs:
   vdev:
     required: false
     default: true
-    description: "Install vdev CLI tool via cargo binstall (uses VDEV_VERSION pinned in prepare.sh)."
+    description: "Install vdev CLI tool via cargo binstall (version from vdev/Cargo.toml)."
 
   # prepare.sh - npm
   markdownlint-cli2:
@@ -239,7 +239,7 @@ runs:
           ~/.cargo/bin/dd-rust-license-tool
           ~/.cargo/bin/wasm-pack
           ~/.cargo/bin/vdev
-        key: ${{ runner.os }}-cargo-binaries-${{ hashFiles('scripts/environment/*.sh') }}
+        key: ${{ runner.os }}-cargo-binaries-${{ hashFiles('scripts/environment/*.sh', 'vdev/Cargo.toml') }}
         restore-keys: |
           ${{ runner.os }}-cargo-binaries-
 

scripts/environment/prepare.sh

@@ -39,7 +39,6 @@ CARGO_LLVM_COV_VERSION="0.8.4"
 WASM_PACK_VERSION="0.13.1"
 # npm tool versions are defined in scripts/environment/npm-tools/package.json
 # and pinned (including transitive deps) in npm-tools/package-lock.json.
-VDEV_VERSION="0.3.3"
 
 ALL_MODULES=(
   rustup
@@ -122,11 +121,13 @@ contains_module() {
 }
 
 # Helper function to check version and install if needed
-# Usage: maybe_install_cargo_tool <tool-name> <version> [<version-check-pattern>]
+# Usage: maybe_install_cargo_tool <tool-name> [<version> [<version-check-pattern>]]
 # Note: cargo-* tools are invoked as "cargo <subcommand>", not as direct binaries
+# vdev omits the version argument: binstall reads it from vdev/Cargo.toml via
+# --manifest-path, which also provides the pkg-url so crates.io is not consulted.
 maybe_install_cargo_tool() {
   local tool="$1"
-  local version="$2"
+  local version="${2:-}"
   local version_pattern="${3:-${tool} ${version}}"  # Default to "tool version"
 
   if ! contains_module "$tool"; then
@@ -139,11 +140,42 @@ maybe_install_cargo_tool() {
     version_cmd="cargo ${tool#cargo-}"
   fi
 
-  # vdev fails fast on missing prebuilts so a cache/asset miss can't
-  # reintroduce the source-compile path that previously stalled a release.
-  local installer=("${install[@]}")
-  if [[ "$tool" == "vdev" && "${installer[0]}" == "binstall" ]]; then
-    installer+=(--disable-strategies compile)
+  # vdev: binstall reads the version and pkg-url from vdev/Cargo.toml via
+  # --manifest-path, so vdev/Cargo.toml is the single source of truth.
+  # `--disable-strategies compile` skips binstall's own crates.io compile
+  # fallback (which would fail anyway on an unpublished version, and
+  # silently slow-paths a cache flake into a multi-minute build). If
+  # binstall fails for any reason — missing prebuilt for a freshly bumped
+  # version, or a transient cache/network issue — we fall back to building
+  # from the working tree. That gives PRs that bump vdev's version a
+  # working binary built from their own changes, and keeps master CI green
+  # in the gap between merging a vdev version bump and pushing the tag.
+  if [[ "$tool" == "vdev" ]]; then
+    # Skip the install entirely when the cached binary already matches the
+    # version in vdev/Cargo.toml (the setup workflow restores ~/.cargo/bin/vdev
+    # from cache, but not binstall's resolution metadata, so without this check
+    # every job with `vdev: true` would re-hit GitHub releases).
+    local cargo_toml_version
+    cargo_toml_version=$(grep -E '^version = ' vdev/Cargo.toml | head -1 | sed -E 's/.*"([^"]+)".*/\1/')
+    if vdev --version 2>/dev/null | grep -q "^vdev ${cargo_toml_version}$"; then
+      echo "vdev ${cargo_toml_version} already installed"
+      return 0
+    fi
+
+    local installer=("${install[@]}")
+    if [[ "${installer[0]}" == "binstall" ]]; then
+      installer+=(--disable-strategies compile)
+      if ! cargo "${installer[@]}" --manifest-path vdev/Cargo.toml vdev; then
+        echo "binstall failed; building vdev from the working tree..."
+        cargo install -f --path vdev --locked
+      fi
+    else
+      # binstall unavailable. `cargo install vdev` (no version) would resolve
+      # against crates.io and could pick an older version than the checkout
+      # declares; install from the working tree to match vdev/Cargo.toml.
+      cargo install -f --path vdev --locked
+    fi
+    return 0
   fi
 
   if ! $version_cmd --version 2>/dev/null | grep -q "^${version_pattern}"; then
@@ -163,7 +195,7 @@ maybe_install_cargo_tool() {
       fi
     fi
     if [[ "$should_install" == "true" ]]; then
-      cargo "${installer[@]}" "$tool" --version "$version" --force --locked
+      cargo "${install[@]}" "$tool" --version "$version" --force --locked
     fi
   fi
 
@@ -289,6 +321,6 @@ maybe_install_cargo_tool cargo-hack "${CARGO_HACK_VERSION}"
 maybe_install_cargo_tool cargo-llvm-cov "${CARGO_LLVM_COV_VERSION}"
 maybe_install_cargo_tool dd-rust-license-tool "${DD_RUST_LICENSE_TOOL_VERSION}"
 maybe_install_cargo_tool wasm-pack "${WASM_PACK_VERSION}"
-maybe_install_cargo_tool vdev "${VDEV_VERSION}"
+maybe_install_cargo_tool vdev
 
 maybe_install_npm_tools

vdev/README.md

@@ -39,7 +39,7 @@ CI installs vdev from a published binary release via [cargo-binstall](https://gi
 ./scripts/environment/prepare.sh --modules=vdev
 ```
 
-This pins the vdev version defined in `prepare.sh` and fetches the matching pre-compiled binary.
+This installs the vdev version declared in `vdev/Cargo.toml` by fetching the matching pre-compiled binary from the GitHub release. If no matching release exists yet — e.g. you're on a branch that bumped the version but hasn't been tagged — `prepare.sh` falls back to building vdev from your working tree (`cargo install --path vdev`), which is slower but ensures the installed binary reflects your branch's vdev source.
 
 For a quick install of the latest published vdev (not pinned):