Merge pull request #1668 from GoogleContainerTools/fix-build

fix build
GoogleContainerTools · Sep 13, 2024 · 844a1dd · 844a1dd
2 parents fcacaeb + 452ea7c
commit 844a1dd
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 45 deletions.
diff --git a/.cloudbuild/release.sh b/.cloudbuild/release.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -o errexit -o xtrace
+set -o errexit -o xtrace -o pipefail
 
 # setup remote cache
 curl -fsSL https://github.com/buchgr/bazel-remote/releases/download/v2.4.0/bazel-remote-2.4.0-linux-x86_64 -o bazel-remote
@@ -8,9 +8,10 @@ chmod +x bazel-remote
 mkdir .logs
 ./bazel-remote --max_size 8 --dir ~/.cache/bazel-remote --experimental_remote_asset_api --grpc_address 0.0.0.0:4700 --gcs_proxy.bucket $REMOTE_CACHE_GCS --gcs_proxy.use_default_credentials > .logs/bazel-remote.log 2>&1 &
 
-# install bazel 6
-apt-get install bazel-6.0.0
-ln -sf /usr/bin/bazel-6.0.0 /usr/bin/bazel
+# install bazel
+VERSION=$(cat .bazelversion)
+apt-get install "bazel-${VERSION}"
+ln -sf "/usr/bin/bazel-${VERSION}" /usr/bin/bazel
 
 # setup remote caching and remote asset API.
 echo "common --remote_cache=grpc://0.0.0.0:4700" >> ~/.bazelrc

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock