Skip to content

Commit

Permalink
Fix caching on Linux and MacOS (#6270)
Browse files Browse the repository at this point in the history
When bumping the cache url on Windows, I accidentally also changed the
URL we push to on Linux and MacOS. This is obviously a bad idea so
this PR fixes it.

changelog_begin
changelog_end
  • Loading branch information
cocreature authored Jun 9, 2020
1 parent 8bdcfec commit aac1e16
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion ci/configure-bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ if [ ! -z "${BAZEL_CONFIG_DIR:-}" ]; then
cd "$BAZEL_CONFIG_DIR"
fi

CACHE_URL="https://storage.googleapis.com/daml-bazel-cache"

if is_windows; then
CACHE_URL="$CACHE_URL/v1"
echo "build --config windows" > .bazelrc.local
echo "build --config windows-ci" >> .bazelrc.local

Expand Down Expand Up @@ -81,5 +84,5 @@ if [[ "${IS_FORK}" = False ]]; then
echo "$GOOGLE_APPLICATION_CREDENTIALS_CONTENT" > "$GOOGLE_APPLICATION_CREDENTIALS"
unset GOOGLE_APPLICATION_CREDENTIALS_CONTENT
export GOOGLE_APPLICATION_CREDENTIALS
echo "build --remote_http_cache=https://storage.googleapis.com/daml-bazel-cache/v1 --remote_upload_local_results=true --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS}" >> .bazelrc.local
echo "build --remote_http_cache=$CACHE_URL --remote_upload_local_results=true --google_credentials=${GOOGLE_APPLICATION_CREDENTIALS}" >> .bazelrc.local
fi

0 comments on commit aac1e16

Please sign in to comment.