From a60851167251b304ea74c06e7059364e09526ed4 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Fri, 22 Oct 2021 17:37:51 +0000 Subject: [PATCH 1/2] bazel: copy .bazelversion for envoy filter examples This file needs to be copied otherwise bazelisk picks whichever current version is out there which could break with any release Signed-off-by: Keith Smiley --- ci/filter_example_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/filter_example_setup.sh b/ci/filter_example_setup.sh index 5ef74fa49119..26a093910335 100644 --- a/ci/filter_example_setup.sh +++ b/ci/filter_example_setup.sh @@ -25,6 +25,7 @@ sed -e "s|{ENVOY_SRCDIR}|${ENVOY_SRCDIR}|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter mkdir -p "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/bazel ln -sf "${ENVOY_SRCDIR}"/bazel/get_workspace_status "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/bazel/ cp -f "${ENVOY_SRCDIR}"/.bazelrc "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/ +cp -f "${ENVOY_SRCDIR}"/.bazelversion "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/ cp -f "$(bazel info workspace)"/*.bazelrc "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/ export FILTER_WORKSPACE_SET=1 From d66fed1fab45a496a96d1b933a9bce24aac56d02 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Fri, 22 Oct 2021 20:17:02 +0000 Subject: [PATCH 2/2] Remove first Signed-off-by: Keith Smiley --- ci/filter_example_setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/filter_example_setup.sh b/ci/filter_example_setup.sh index 26a093910335..2447a79e41d4 100644 --- a/ci/filter_example_setup.sh +++ b/ci/filter_example_setup.sh @@ -25,6 +25,7 @@ sed -e "s|{ENVOY_SRCDIR}|${ENVOY_SRCDIR}|" "${ENVOY_SRCDIR}"/ci/WORKSPACE.filter mkdir -p "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/bazel ln -sf "${ENVOY_SRCDIR}"/bazel/get_workspace_status "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/bazel/ cp -f "${ENVOY_SRCDIR}"/.bazelrc "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/ +rm -f "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/.bazelversion cp -f "${ENVOY_SRCDIR}"/.bazelversion "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/ cp -f "$(bazel info workspace)"/*.bazelrc "${ENVOY_FILTER_EXAMPLE_SRCDIR}"/