Skip to content

Allow local modification of envoy.bazelrc #6854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amdonov wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −9
Open

Allow local modification of envoy.bazelrc #6854

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8013106
Allow local modification of envoy.bazelrc
amdonov Feb 26, 2026
66760c9
Simplify enovoy.bazelrc merge behavior
amdonov Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Simplify enovoy.bazelrc merge behavior 
Signed-off-by: Aaron Donovan <amdonov@amazon.com>
  • Loading branch information
@amdonov
amdonov committed Feb 27, 2026
commit 66760c9bd45a13e3540cae2dd5b2368099fbbda0
8 changes: 2 additions & 6 deletions scripts/update_envoy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,14 @@ curl -sSL "https://raw.githubusercontent.com/${ENVOY_ORG}/${ENVOY_REPO}/${LATEST
# On conflict, take upstream version (consistent with previous behavior)
OLD_BAZELRC=$(mktemp)
NEW_BAZELRC=$(mktemp)
MERGED_BAZELRC=$(mktemp)

curl -sSL "https://raw.githubusercontent.com/${ENVOY_ORG}/${ENVOY_REPO}/${OLD_SHA}/.bazelrc" > "${OLD_BAZELRC}"
curl -sSL "https://raw.githubusercontent.com/${ENVOY_ORG}/${ENVOY_REPO}/${LATEST_SHA}/.bazelrc" > "${NEW_BAZELRC}"

# Attempt merge; on conflict, use upstream version
if git merge-file -p envoy.bazelrc "${OLD_BAZELRC}" "${NEW_BAZELRC}" > "${MERGED_BAZELRC}" 2>/dev/null; then
mv "${MERGED_BAZELRC}" envoy.bazelrc
else
if ! git merge-file envoy.bazelrc "${OLD_BAZELRC}" "${NEW_BAZELRC}" 2>/dev/null; then
# Conflicts exist - resolve by taking upstream (theirs)
git merge-file -p --theirs envoy.bazelrc "${OLD_BAZELRC}" "${NEW_BAZELRC}" > "${MERGED_BAZELRC}"
mv "${MERGED_BAZELRC}" envoy.bazelrc
git merge-file --theirs envoy.bazelrc "${OLD_BAZELRC}" "${NEW_BAZELRC}"
fi

rm -f "${OLD_BAZELRC}" "${NEW_BAZELRC}"