fix(ci): use VDEV env var whenever present

Author: thomasqueirozb

scripts/build-docker.sh

@@ -10,8 +10,8 @@ set -euo pipefail
 
 set -x
 
-CHANNEL="${CHANNEL:-"$(cargo vdev release channel)"}"
-VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+CHANNEL="${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}"
+VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
 DATE="${DATE:-"$(date -u +%Y-%m-%d)"}"
 PLATFORM="${PLATFORM:-}"
 PUSH="${PUSH:-"true"}"

scripts/build.sh

@@ -24,7 +24,7 @@ FEATURES="${FEATURES:-"default"}"
 NATIVE_BUILD="${NATIVE_BUILD:-"true"}"
 TARGET="${TARGET:?"You must specify a target triple, ex: arm64-apple-darwin"}"
 
-CHANNEL=${CHANNEL:-"$(cargo vdev release channel)"}
+CHANNEL=${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}
 if [ "$CHANNEL" == "nightly" ]; then
   FEATURES="$FEATURES nightly"
 fi

scripts/cue.sh

@@ -16,7 +16,7 @@ list-docs-files() {
 }
 
 cmd_check() {
-  cargo vdev check docs
+  ${VDEV:-cargo vdev} check docs
 }
 
 cmd_list() {

scripts/package-archive.sh

@@ -24,7 +24,7 @@ OVERWRITE=${OVERWRITE:-"true"}
 ARCHIVE_TYPE="${ARCHIVE_TYPE:-"tar.gz"}"
 NATIVE_BUILD="${NATIVE_BUILD:-"true"}"
 TARGET="${TARGET:?"You must specify a target triple, ex: arm64-apple-darwin"}"
-ARCHIVE_VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+ARCHIVE_VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
 
 #
 # Local Vars

scripts/package-deb.sh

@@ -19,7 +19,7 @@ TARGET="${TARGET:?"You must specify a target triple, ex: arm64-apple-darwin"}"
 #
 
 PROJECT_ROOT="$(pwd)"
-PACKAGE_VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+PACKAGE_VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
 ARCHIVE_NAME="vector-${PACKAGE_VERSION}-$TARGET.tar.gz"
 ARCHIVE_PATH="target/artifacts/$ARCHIVE_NAME"
 ABSOLUTE_ARCHIVE_PATH="$PROJECT_ROOT/$ARCHIVE_PATH"

scripts/package-msi.sh

@@ -9,7 +9,7 @@ set -euo pipefail
 
 set -x
 
-ARCHIVE_VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+ARCHIVE_VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
 
 rm -rf target/msi-x64
 cp -R distribution/msi target/msi-x64
@@ -24,7 +24,7 @@ powershell '$progressPreference = "silentlyContinue"; Expand-Archive vector-'"$A
 #     C:\a\vector\vector\target\msi-x64\vector.wxs(6) : error CNDL0108 : The Product/@Version attribute's value, '0.29.0.custom.a28ecdc', is not a valid version.
 #     Legal version values should look like 'x.x.x.x' where x is an integer from 0 to 65534.
 # , by  changing "0.29.0.custom.a28ecdc" -> "0.29.0".
-CHANNEL="${CHANNEL:-"$(cargo vdev release channel)"}"
+CHANNEL="${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}"
 
 if [[ "$CHANNEL" == "custom" ]]; then
     PACKAGE_VERSION="${ARCHIVE_VERSION%.custom*}"

scripts/package-rpm.sh

@@ -17,7 +17,7 @@ TARGET="${TARGET:?"You must specify a target triple, ex: arm64-apple-darwin"}"
 # Local vars
 #
 
-PACKAGE_VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+PACKAGE_VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
 ARCHIVE_NAME="vector-$PACKAGE_VERSION-$TARGET.tar.gz"
 ARCHIVE_PATH="target/artifacts/$ARCHIVE_NAME"
 

scripts/release-s3.sh

@@ -7,8 +7,8 @@ set -euo pipefail
 #
 #   Uploads archives and packages to S3
 
-CHANNEL="${CHANNEL:-"$(cargo vdev release channel)"}"
-VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+CHANNEL="${CHANNEL:-"$(${VDEV:-cargo vdev} release channel)"}"
+VERSION="${VECTOR_VERSION:-"$(${VDEV:-cargo vdev} version)"}"
 DATE="${DATE:-"$(date -u +%Y-%m-%d)"}"
 VERIFY_TIMEOUT="${VERIFY_TIMEOUT:-"30"}" # seconds
 VERIFY_RETRIES="${VERIFY_RETRIES:-"2"}"

scripts/run-integration-test.sh

@@ -104,7 +104,7 @@ if [[ ${#TEST_ENV} -gt 0 ]]; then
   TEST_ENVIRONMENTS="${TEST_ENV}"
 else
   # Collect all available environments via auto-discovery
-  mapfile -t TEST_ENVIRONMENTS < <(cargo vdev "${VERBOSITY}" "${TEST_TYPE}" show -e "${TEST_NAME}")
+  mapfile -t TEST_ENVIRONMENTS < <(${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" show -e "${TEST_NAME}")
   if [[ ${#TEST_ENVIRONMENTS[@]} -eq 0 ]]; then
     echo "ERROR: no environments found for ${TEST_TYPE} test '${TEST_NAME}'" >&2
     exit 1
@@ -127,12 +127,12 @@ for TEST_ENV in "${TEST_ENVIRONMENTS[@]}"; do
   docker run --rm -v vector_target:/output/"${TEST_NAME}" alpine:3.20 \
     sh -c "rm -rf /output/${TEST_NAME}/*"
 
-  cargo vdev "${VERBOSITY}" "${TEST_TYPE}" start "${TEST_NAME}" "${TEST_ENV}"
+  ${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" start "${TEST_NAME}" "${TEST_ENV}"
   START_RET=$?
   print_compose_logs_on_failure "$START_RET"
 
   if [[ "$START_RET" -eq 0 ]]; then
-    cargo vdev "${VERBOSITY}" "${TEST_TYPE}" test --retries "$RETRIES" "${TEST_NAME}" "${TEST_ENV}"
+    ${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" test --retries "$RETRIES" "${TEST_NAME}" "${TEST_ENV}"
     RET=$?
     print_compose_logs_on_failure "$RET"
 
@@ -144,7 +144,7 @@ for TEST_ENV in "${TEST_ENVIRONMENTS[@]}"; do
   fi
 
   # Always stop the environment (best effort cleanup)
-  cargo vdev "${VERBOSITY}" "${TEST_TYPE}" stop "${TEST_NAME}" || true
+  ${VDEV:-cargo vdev} "${VERBOSITY}" "${TEST_TYPE}" stop "${TEST_NAME}" || true
 
   # Exit early on first failure
   if [[ "$RET" -ne 0 ]]; then