correctly link /usr/bin/cargo and /usr/bin/rustc

Author: encrypt94

taskcluster/docker/linux-dpkg-build/Dockerfile

@@ -50,7 +50,7 @@ RUN /root/setup-worker.sh
 WORKDIR /builds/worker/
 
 # Grant the worker user the ability to install packages without login
-RUN echo "worker ALL=(ALL) SETENV:NOPASSWD:/usr/bin/apt,/usr/bin/apt-get,/usr/bin/dpkg,/usr/bin/mk-build-deps" > /etc/sudoers.d/worker-packages
+RUN echo "worker ALL=(ALL) SETENV:NOPASSWD:/usr/bin/apt,/usr/bin/apt-get,/usr/bin/dpkg,/usr/bin/mk-build-deps,/usr/bin/ln" > /etc/sudoers.d/worker-packages
 
 #----------------------------------------------------------------------------------------------------------------------
 #-- Task Setup --------------------------------------------------------------------------------------------------------

taskcluster/docker/linux-qt6-build/Dockerfile

@@ -115,7 +115,7 @@ RUN /root/setup-worker.sh
 WORKDIR /builds/worker/
 
 # Grant the worker user the ability to install packages without login
-RUN echo "worker ALL=(ALL) SETENV:NOPASSWD:/usr/bin/apt,/usr/bin/apt-get,/usr/bin/dpkg,/usr/bin/mk-build-deps" > /etc/sudoers.d/worker-packages
+RUN echo "worker ALL=(ALL) SETENV:NOPASSWD:/usr/bin/apt,/usr/bin/apt-get,/usr/bin/dpkg,/usr/bin/mk-build-deps,/usr/bin/ln" > /etc/sudoers.d/worker-packages
 
 #----------------------------------------------------------------------------------------------------------------------
 #-- Task Setup --------------------------------------------------------------------------------------------------------

taskcluster/scripts/build/linux_build_dpkg.sh

@@ -132,6 +132,17 @@ fi
 sudo mk-build-deps --tool 'apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends' \
    --install --remove $MK_BUILD_DEPS_ARGS "$(pwd)/mozillavpn-source/debian/control"
 
+# /usr/bin/cargo and /usr/bin/rustc may be installed as cargo-<version> and rustc-<version> 
+# Find the latest versions of these binaries as installed  by the build dependencies and link them to /usr/bin.
+
+if ! command -v cargo >/dev/null 2>&1; then
+    CARGO_BIN=$(find /usr/bin -maxdepth 1 -type f -name 'cargo-*' | sort -V | tail -n1)
+    RUSTC_BIN=$(find /usr/bin -maxdepth 1 -type f -name 'rustc-*' | sort -V | tail -n1)
+
+    [ -n "$CARGO_BIN" ] && sudo ln -sf "$CARGO_BIN" /usr/bin/cargo
+    [ -n "$RUSTC_BIN" ] && sudo ln -sf "$RUSTC_BIN" /usr/bin/rustc
+else
+
 (cd mozillavpn-source/ && dpkg-buildpackage $DPKG_PACKAGE_BUILD_ARGS)
 
 # Compress all build artifacts into a tarball