Skip to content

build: update for latest goyacc #4106

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

Merged
sougou merged 1 commit into from
Jul 26, 2018
Merged

build: update for latest goyacc #4106

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 bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ function install_chromedriver() {
unzip -o -q chromedriver_linux64.zip -d "$dist"
rm chromedriver_linux64.zip
}
install_dep "chromedriver" "2.25" "$VTROOT/dist/chromedriver" install_chromedriver
install_dep "chromedriver" "2.40" "$VTROOT/dist/chromedriver" install_chromedriver


#
Expand Down
2 changes: 2 additions & 0 deletions go/vt/sqlparser/sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions tools/check_make_parser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@ if ! cd go/vt/sqlparser/ ; then
exit 1
fi

goyacc -o $TMP sql.y
gofmt -w $TMP
mv $CUR $TMP
goyacc -o $CUR sql.y
gofmt -w $CUR

if ! diff -q $CUR $TMP > /dev/null ; then
echo "ERROR: Regenerated parser $TMP does not match current version $(pwd)/sql.go:"
diff -u $CUR $TMP
rm $TMP
mv $TMP $CUR

echo
echo "Please ensure go and goyacc are up to date and re-run 'make parser' to generate."
exit 1
fi

rm $TMP
mv $TMP $CUR