ci/go: Fix compiler for api.go target (envoyproxy#30529)

Signed-off-by: Ryan Northey <[email protected]>
fredyw · Oct 26, 2023 · 9a1b42e · 9a1b42e
1 parent 7e34671
commit 9a1b42e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ci/build_setup.sh b/ci/build_setup.sh
@@ -56,6 +56,10 @@ function setup_gcc_toolchain() {
 }
 
 function setup_clang_toolchain() {
+  if [[ -n "$CLANG_TOOLCHAIN_SETUP" ]]; then
+    return
+  fi
+  export CLANG_TOOLCHAIN_SETUP=1
   ENVOY_STDLIB="${ENVOY_STDLIB:-libc++}"
   if [[ -z "${ENVOY_RBE}" ]]; then
     if [[ "${ENVOY_STDLIB}" == "libc++" ]]; then

diff --git a/ci/do_ci.sh b/ci/do_ci.sh
@@ -278,9 +278,7 @@ case $CI_TARGET in
         ;&
 
     api.go)
-        if [[ -z "$NO_BUILD_SETUP" ]]; then
-            setup_clang_toolchain
-        fi
+        setup_clang_toolchain
         GO_IMPORT_BASE="github.com/envoyproxy/go-control-plane"
         GO_TARGETS=(@envoy_api//...)
         read -r -a GO_PROTOS <<< "$(bazel query "${BAZEL_GLOBAL_OPTIONS[@]}" "kind('go_proto_library', ${GO_TARGETS[*]})" | tr '\n' ' ')"