Skip to content

ci: write CI Bazel flags to user.bazelrc instead of removed repo.bazelrc - #1638

Open
tomjzzhang wants to merge 3 commits into
envoyproxy:mainfrom
tomjzzhang:fix-ci-user-bazelrc
Open

tomjzzhang wants to merge 3 commits into
envoyproxy:mainfrom
tomjzzhang:fix-ci-user-bazelrc

Conversation

@tomjzzhang

Copy link
Copy Markdown
Contributor

When #1627 synced .bazelrc with upstream Envoy PR envoyproxy/envoy#47806, it removed try-import %workspace%/repo.bazelrc from the bottom of .bazelrc. However, .github/workflows/_ci.yml still writes the CI compiler and resource configurations to repo.bazelrc, so Bazel no longer loads those settings during CI runs.

This PR replaces repo.bazelrc with user.bazelrc in .github/workflows/_ci.yml (and adds the upstream Envoy fallback in ci/do_ci.sh to copy repo.bazelrc to user.bazelrc if present), as user.bazelrc remains imported at the bottom of .bazelrc and ignored by .gitignore.

When envoyproxy#1627 synced .bazelrc with upstream Envoy PR envoyproxy/envoy#47806, it removed try-import %workspace%/repo.bazelrc from the bottom of .bazelrc. However, .github/workflows/_ci.yml still writes the CI compiler and resource configurations to repo.bazelrc, so Bazel no longer loads those settings during CI runs.

This PR replaces repo.bazelrc with user.bazelrc in .github/workflows/_ci.yml (and adds the upstream Envoy fallback in ci/do_ci.sh to copy repo.bazelrc to user.bazelrc if present), as user.bazelrc remains imported at the bottom of .bazelrc and ignored by .gitignore.

Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com>
Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com>
Signed-off-by: tomjzzhang <4367421+tomjzzhang@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant