Skip to content

Commit

Permalink
[7.x] [Bazel] Only persist cache and create build invocations in on-m…
Browse files Browse the repository at this point in the history
…erge pipeline (elastic#114035) (elastic#114339)

* [Bazel] Only persist cache and create build invocations in on-merge pipeline (elastic#114035)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

* [ci] Fix setup_bazel permissions

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Co-authored-by: Tyler Smalley <tyler.smalley@elastic.co>
  • Loading branch information
kibanamachine and Tyler Smalley committed Oct 7, 2021
1 parent b63428a commit 3b4bb6f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
11 changes: 6 additions & 5 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
# Import shared settings first so we can override below
import %workspace%/.bazelrc.common

## Disabled for now
# Remote cache settings for local env
# build --remote_cache=https://storage.googleapis.com/kibana-bazel-cache
# build --incompatible_remote_results_ignore_disk=true
# build --remote_accept_cached=true
# build --remote_upload_local_results=false
build --remote_cache=grpcs://cloud.buildbuddy.io
build --incompatible_remote_results_ignore_disk=true
build --noremote_upload_local_results
build --remote_timeout=30
build --remote_header=x-buildbuddy-api-key=3EYk49W2NefOx2n3yMze
build --remote_accept_cached=true

# BuildBuddy
## Metadata settings
Expand Down
Empty file modified .buildkite/scripts/common/setup_bazel.sh
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion .buildkite/scripts/lifecycle/pre_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ if [[ "${SKIP_CI_SETUP:-}" != "true" ]]; then
if [[ -d .buildkite/scripts && "${BUILDKITE_COMMAND:-}" != "buildkite-agent pipeline upload"* ]]; then
source .buildkite/scripts/common/env.sh
source .buildkite/scripts/common/setup_node.sh
source .buildkite/scripts/common/setup_bazel.sh
fi
fi

Expand Down
3 changes: 3 additions & 0 deletions .buildkite/scripts/steps/on_merge_build_and_metrics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

set -euo pipefail

# Write Bazel cache for Linux
.buildkite/scripts/common/setup_bazel.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/build_kibana.sh
.buildkite/scripts/post_build_kibana.sh
Expand Down

0 comments on commit 3b4bb6f

Please sign in to comment.