chore(ci): use VDEV env var in scripts (#24862)

* fix(ci): use VDEV env var whenever present

* Install vdev in actions

* Add and use vdev_cmd

Author: thomasqueirozb

.github/workflows/integration.yml

@@ -88,6 +88,12 @@ jobs:
         with:
           submodules: "recursive"
 
+      - uses: ./.github/actions/setup
+        with:
+          vdev: true
+          mold: false
+          cargo-cache: false
+
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         if: github.event_name == 'merge_group'
@@ -150,6 +156,12 @@ jobs:
         with:
           submodules: "recursive"
 
+      - uses: ./.github/actions/setup
+        with:
+          vdev: true
+          mold: false
+          cargo-cache: false
+
       - name: Download JSON artifact from changes.yml
         uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         if: github.event_name == 'merge_group'

.github/workflows/k8s_e2e.yml

@@ -179,6 +179,12 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
+      - uses: ./.github/actions/setup
+        with:
+          vdev: true
+          mold: false
+          cargo-cache: false
+
       - uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: e2e-test-deb-package

scripts/build-docker.sh

@@ -10,8 +10,10 @@ set -euo pipefail
 
 set -x
 
-CHANNEL="${CHANNEL:-"$(cargo vdev release channel)"}"
-VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+vdev_cmd="${VDEV:-cargo vdev}"
+
+CHANNEL="${CHANNEL:-"$($vdev_cmd release channel)"}"
+VERSION="${VECTOR_VERSION:-"$($vdev_cmd 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,9 @@ set -euo pipefail
 
 set -x
 
-ARCHIVE_VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+vdev_cmd="${VDEV:-cargo vdev}"
+
+ARCHIVE_VERSION="${VECTOR_VERSION:-"$($vdev_cmd version)"}"
 
 rm -rf target/msi-x64
 cp -R distribution/msi target/msi-x64
@@ -24,7 +26,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_cmd 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,10 @@ set -euo pipefail
 #
 #   Uploads archives and packages to S3
 
-CHANNEL="${CHANNEL:-"$(cargo vdev release channel)"}"
-VERSION="${VECTOR_VERSION:-"$(cargo vdev version)"}"
+vdev_cmd="${VDEV:-cargo vdev}"
+
+CHANNEL="${CHANNEL:-"$($vdev_cmd release channel)"}"
+VERSION="${VECTOR_VERSION:-"$($vdev_cmd version)"}"
 DATE="${DATE:-"$(date -u +%Y-%m-%d)"}"
 VERIFY_TIMEOUT="${VERIFY_TIMEOUT:-"30"}" # seconds
 VERIFY_RETRIES="${VERIFY_RETRIES:-"2"}"