jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-05-27 22:27:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(envoy-build): add patch command check and improve error handling logic (#3734)

Browse Source
This commit is contained in:
Kent Dong
2026-04-20 13:41:42 +08:00
committed by GitHub
parent d72363d8d1
commit 90ccfc7ec5
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/hack/build-envoy.sh
View File

@@ -19,12 +19,24 @@ set -euo pipefail
SCRIPT_DIR="$(cd "$(dirname -- "$0")" &> /dev/null && pwd)" SCRIPT_DIR="$(cd "$(dirname -- "$0")" &> /dev/null && pwd)"
source "${SCRIPT_DIR}/setup-istio-env.sh" source "${SCRIPT_DIR}/setup-istio-env.sh"
if ! command -v patch >/dev/null 2>&1; then
echo "ERROR: 'patch' command not found. Please install it first (e.g. apt install patch / yum install patch / brew install gpatch)." >&2
exit 1
fi
cd ${ROOT}/external/proxy cd ${ROOT}/external/proxy
if patch_output=$(patch -d . -s -f --dry-run -p1 < ${SCRIPT_DIR}/build-envoy.patch 2>&1); then if patch_output=$(patch -d . -s --dry-run -p1 < ${SCRIPT_DIR}/build-envoy.patch 2>&1); then
patch -d . -p1 < ${SCRIPT_DIR}/build-envoy.patch patch -d . -s -p1 < ${SCRIPT_DIR}/build-envoy.patch
else elif reverse_output=$(patch -d . -s -R --dry-run -p1 < ${SCRIPT_DIR}/build-envoy.patch 2>&1); then
echo "build-envoy.patch was already patched" echo "build-envoy.patch was already patched"
else
echo "ERROR: failed to apply build-envoy.patch" >&2
echo "Patch output:" >&2
echo "${patch_output}" >&2
echo "Reverse patch output:" >&2
echo "${reverse_output}" >&2
exit 1
fi fi
CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${ROOT}/external/package,destination=/home/package " CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${ROOT}/external/package,destination=/home/package "