From 2d3999440d4a38193ba33feddcf7fab8b5a515db Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:15:29 +0200 Subject: [PATCH] bazel: use cache path to execute cli This way it also works within the bazel container, where the symlinks that are created won't work, as they are linking to host paths. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/devbuild/prepare_developer_workspace.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel/devbuild/prepare_developer_workspace.sh.in b/bazel/devbuild/prepare_developer_workspace.sh.in index b1fed4b7c..bd3fa53e8 100755 --- a/bazel/devbuild/prepare_developer_workspace.sh.in +++ b/bazel/devbuild/prepare_developer_workspace.sh.in @@ -63,11 +63,11 @@ ln -sf "$(replace_prefix "${host_cache}" "${builder_cache}" "${cdbg}")" "${workd ln -sf "$(replace_prefix "${host_cache}" "${builder_cache}" "${container_sums}")" "${workdir}/container_sums.sha256" ln -sf "$(replace_prefix "${host_cache}" "${builder_cache}" "${cli}")" "${workdir}/constellation" -build_version=$("${workdir}"/constellation version | grep ^Version: | awk '{print $2}') +build_version=$("${cli}" version | grep ^Version: | awk '{print $2}') if [[ ! -f "${workdir}/constellation-conf.yaml" ]]; then echo "constellation-conf.yaml not present in workspace" echo "Build version: ${build_version}" else - $yq -i eval ".microserviceVersion=\"${build_version}\"" ./constellation-conf.yaml + ${yq} -i eval ".microserviceVersion=\"${build_version}\"" ./constellation-conf.yaml echo "Microservice version updated to ${build_version} in constellation-conf.yaml" fi