Skip to content
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

Jump to bottom

script: update guide to use git apply - to resolve bazel change #56646

Merged
merged 1 commit into from
Oct 15, 2024
Merged

script: update guide to use git apply - to resolve bazel change #56646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tools/check/check-bazel-prepare-rbe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ make bazel_ci_prepare_rbe
after_checksum=`find . -type f \( -name '*.bazel' -o -name '*.bzl' \) -exec md5sum {} \;| sort -k 2`
if [ "$before_checksum" != "$after_checksum" ]
then
echo "Please run \`make bazel_prepare\` to update \`.bazel\` files, or just apply the following git diff (run \`git apply -\` and paste following contents):"
echo "Please run \`make bazel_prepare\` to update \`.bazel\` files, or just apply the following git diff (run \`git apply -\` and paste following contents with ctrl-D as ending):"
git diff
echo -e "\n\nChecksum diff:"
diff <(echo "$before_checksum") <(echo "$after_checksum") || true
Expand Down
2 changes: 1 addition & 1 deletion tools/check/check-bazel-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ make bazel_ci_prepare
after_checksum=`find . -type f \( -name '*.bazel' -o -name '*.bzl' \) -exec md5sum {} \;| sort -k 2`
if [ "$before_checksum" != "$after_checksum" ]
then
echo "Please run \`make bazel_prepare\` to update \`.bazel\` files, or just apply the following git diff (run \`git apply -\` and paste following contents):"
echo "Please run \`make bazel_prepare\` to update \`.bazel\` files, or just apply the following git diff (run \`git apply -\` and paste following contents with ctrl-D as ending):"
git diff
echo -e "\n\nChecksum diff:"
diff <(echo "$before_checksum") <(echo "$after_checksum") || true
Expand Down