build: fix the deletion of old pkg/sql/exec/*.eg.go files #40765
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
yuzefovich
force-pushed
the
fix-build
branch
from
9b81a32
to
6b8febb
Compare
yuzefovich
force-pushed
the
fix-build
branch
from
6b8febb
to
24ff5c8
Compare
With the recent renaming of pkg/sql/exec to pkg/sql/colexec, we want to remove the files generated into the old directory. However, the previous commands were not error-prone, i.e. if the directory didn't exist, the command would fail which would in turn could fail the build. Now this is fixed by either redirecting the error into /dev/null or testing for presence of the old directory. Also, remove the unnecessary command to delete pkg/sql/exec/*.og.go files (this was needed only for a few weeks in the Fall of 2018). Release justification: Category 1: Non-production code changes. Release note: None
yuzefovich
force-pushed
the
fix-build
branch
from
24ff5c8
to
62b1678
Compare
|
LGTM. Please kick off another nightly run when this merges, thanks! |
|
TFTR! bors r=jordanlewis |
craig bot
pushed a commit
that referenced
this pull request
Sep 14, 2019
40765: build: fix the deletion of old pkg/sql/exec/*.eg.go files r=jordanlewis a=yuzefovich With the recent renaming of pkg/sql/exec to pkg/sql/colexec, we want to remove the files generated into the old directory. However, the previous commands were not error-prone, i.e. if the directory didn't exist, the command would fail which would in turn could fail the build. Now this is fixed by either redirecting the error into /dev/null or testing for presence of the old directory. Also, remove the unnecessary command to delete pkg/sql/exec/*.og.go files (this was needed only for a few weeks in the Fall of 2018). Release justification: Category 1: Non-production code changes. Release note: None Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
Build succeeded |
knz
reviewed
Sep 16, 2019
| @@ -1551,7 +1548,7 @@ unsafe-clean-c-deps: | |||
| .PHONY: clean-execgen-files | |||
| clean-execgen-files: | |||
| find ./pkg/sql/colexec -type f -name '*.eg.go' -exec rm {} + | |||
| find ./pkg/sql/exec -type f -name '*.eg.go' -exec rm {} + || true | |||
| test -d ./pkg/sql/exec && find ./pkg/sql/exec -type f -name '*.eg.go' -exec rm {} + || true | |||
There was a problem hiding this comment.
tip: I'd have done -exec rm -f ... and removed || true so that you'd still grab permission errors from find if any.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With the recent renaming of pkg/sql/exec to pkg/sql/colexec, we
want to remove the files generated into the old directory. However,
the previous commands were not error-prone, i.e. if the directory
didn't exist, the command would fail which would in turn could fail
the build. Now this is fixed by either redirecting the error into
/dev/null or testing for presence of the old directory.
Also, remove the unnecessary command to delete pkg/sql/exec/*.og.go
files (this was needed only for a few weeks in the Fall of 2018).
Release justification: Category 1: Non-production code changes.
Release note: None