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
Open

Allow local modification of envoy.bazelrc #6854

Show file tree
Hide file tree
Changes from all commits
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
12 changes: 6 additions & 6 deletions envoy.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,18 +223,18 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request

common:fips-common --test_tag_filters=-nofips
common:fips-common --build_tag_filters=-nofips
common:fips-common --//bazel:fips=True
common:fips-common --@envoy//bazel:fips=True

# BoringSSL FIPS
common:boringssl-fips --config=fips-common
common:boringssl-fips --//bazel:ssl=@boringssl_fips//:ssl
common:boringssl-fips --//bazel:crypto=@boringssl_fips//:crypto
common:boringssl-fips --@envoy//bazel:ssl=@boringssl_fips//:ssl
common:boringssl-fips --@envoy//bazel:crypto=@boringssl_fips//:crypto

# AWS-LC FIPS
common:aws-lc-fips --config=fips-common
common:aws-lc-fips --//bazel:ssl=@aws_lc//:ssl
common:aws-lc-fips --//bazel:crypto=@aws_lc//:crypto
common:aws-lc-fips --//bazel:http3=False
common:aws-lc-fips --@envoy//bazel:ssl=@aws_lc//:ssl
common:aws-lc-fips --@envoy//bazel:crypto=@aws_lc//:crypto
common:aws-lc-fips --@envoy//bazel:http3=False


#############################################################################
Expand Down
24 changes: 21 additions & 3 deletions scripts/update_envoy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,16 @@ WORKSPACE=${ROOT}/WORKSPACE
ENVOY_ORG="$(grep -Pom1 "^ENVOY_ORG = \"\K[a-zA-Z-]+" "${WORKSPACE}")"
ENVOY_REPO="$(grep -Pom1 "^ENVOY_REPO = \"\K[a-zA-Z-]+" "${WORKSPACE}")"

# Get OLD_SHA before updating WORKSPACE
OLD_SHA="$(grep -Pom1 "^ENVOY_SHA = \"\K[a-f0-9]+" "${WORKSPACE}")"

# get latest commit for specified org/repo
LATEST_SHA="$(git ls-remote https://github.com/"${ENVOY_ORG}"/"${ENVOY_REPO}" "refs/heads/$UPDATE_BRANCH" | awk '{ print $1}')"
# use ENVOY_SHA if specified
if [[ -n "${ENVOY_SHA}" ]]; then
LATEST_SHA="${ENVOY_SHA}"
fi
DATE=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"${ENVOY_ORG}""/""${ENVOY_REPO}"/commits/"${LATEST_SHA}" | jq '.commit.committer.date')
DATE=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/"${ENVOY_ORG}"/"${ENVOY_REPO}"/commits/"${LATEST_SHA}" | jq '.commit.committer.date')
DATE=$(echo "${DATE/\"/}" | cut -d'T' -f1)

# Get ENVOY_SHA256
Expand All @@ -58,6 +61,21 @@ sed -i "s/Commit date: .*/Commit date: ${DATE}/" "${WORKSPACE}"
sed -i 's/ENVOY_SHA = .*/ENVOY_SHA = "'"$LATEST_SHA"'"/' "${WORKSPACE}"
sed -i 's/ENVOY_SHA256 = .*/ENVOY_SHA256 = "'"$SHA256"'"/' "${WORKSPACE}"

# Update .bazelversion and envoy.bazelrc
# Update .bazelversion
curl -sSL "https://raw.githubusercontent.com/${ENVOY_ORG}/${ENVOY_REPO}/${LATEST_SHA}/.bazelversion" > .bazelversion
curl -sSL "https://raw.githubusercontent.com/${ENVOY_ORG}/${ENVOY_REPO}/${LATEST_SHA}/.bazelrc" > envoy.bazelrc

# Three-way merge envoy.bazelrc to preserve local modifications
# On conflict, take upstream version (consistent with previous behavior)
OLD_BAZELRC=$(mktemp)
NEW_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 envoy.bazelrc "${OLD_BAZELRC}" "${NEW_BAZELRC}" 2>/dev/null; then
# Conflicts exist - resolve by taking upstream (theirs)
git merge-file --theirs envoy.bazelrc "${OLD_BAZELRC}" "${NEW_BAZELRC}"
fi

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