Skip to content

Commit

Permalink
Update version of re2
Browse files Browse the repository at this point in the history
The latest version of re2 contains fixes that makes it compatible with new changes in Bazel.

Fixes #4233

RELNOTES: None.
PiperOrigin-RevId: 178087275
  • Loading branch information
laurentlb authored and Copybara-Service committed Dec 6, 2017
1 parent abc932e commit 2cf560f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ http_archive(
http_archive(
name = "com_googlesource_code_re2",
urls = [
"https://github.com/google/re2/archive/2017-08-01.tar.gz",
"https://github.com/google/re2/archive/2017-12-01.tar.gz",
],
strip_prefix = "re2-2017-08-01",
sha256 = "938723dc197125392698c5fcf41acb74877866ff140b81fd50b7314bf26f1636",
strip_prefix = "re2-2017-12-01",
sha256 = "62797e7cd7cc959419710cd25b075b5f5b247da0e8214d47bf5af9b32128fb0d",
)

# For src/test/shell/bazel:bazel_sandboxing_test
Expand Down
8 changes: 3 additions & 5 deletions compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ set -o errexit
# when running "find".
hash tr >&/dev/null || {
echo >&2 "ERROR: cannot locate GNU coreutils; check your PATH."
echo >&2 " You may need to run the following command:"
echo >&2 " export PATH=\"/bin:/usr/bin:\$PATH\""
echo >&2 " (You may need to run 'export PATH=/bin:/usr/bin:\$PATH)'"
exit 1
}

Expand All @@ -39,9 +38,8 @@ case "$(uname -s | tr [:upper:] [:lower:])" in
msys*|mingw*|cygwin*)
which python.exe >&/dev/null || {
echo >&2 "ERROR: cannot locate python.exe; check your PATH."
echo >&2 " You may need to run the following command, or something"
echo >&2 " similar, depending on where you installed Python:"
echo >&2 " export PATH=\"/c/Python27:\$PATH\""
echo >&2 " (You may need to run 'export PATH=/c/Python27:\$PATH)' or similar,"
echo >&2 " depending on where you installed Python)."
exit 1
}
esac
Expand Down

1 comment on commit 2cf560f

@laszlocsomor
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I accidentally pushed the parent commit (abc932e) of this one to our internal Git mirror (which automatically pushes changes to GitHub), that's why compile.sh is modified by this commit. (Originally it wasn't.)

Please sign in to comment.