Ignore schema_cache.dump on levelbuilder #21793
Conversation
bin/content-push
Outdated
| @@ -5,6 +5,9 @@ require 'cdo/git_utils' | |||
| require 'cdo/only_one' | |||
|
|
|||
| CONTENT_PATHS = 'dashboard pegasus aws/dms'.freeze | |||
| LEVELBUILDER_OMISSIONS = [ | |||
| 'dashboard/db/schema_cache.dump', | |||
| ] | |||
There was a problem hiding this comment.
Please add a brief comment indicating that changes to the files in this list will be reverted during the content push, not just ignored.
There was a problem hiding this comment.
I was using git reset to just ignore them, but realized that would still create problems during the DTL step if there are schema_cache.dump changes. I added a git checkout to revert the changes, and comment to indicate that.
There was a problem hiding this comment.
oops, I misread your git command, and was attempting to ask you to at least comment this rather harsh behavior. however you raise a good point that checkout is probably best here to prevent DTL problems, so what you have now looks good.
| @@ -73,7 +86,8 @@ def commit_changes(name) | |||
|
|
|||
| branchname = GitUtils.current_branch | |||
| exit 1 unless system("git add -A #{CONTENT_PATHS}") | |||
| exit 1 unless system("git commit #{CONTENT_PATHS} -m '#{branchname} content changes (-#{name})'") | |||
| ignore_levelbuilder_omissions | |||
| exit 1 unless system("git commit -m '#{branchname} content changes (-#{name})'") | |||
There was a problem hiding this comment.
just so that I understand, are you changing the behavior on this line or just removing an unnecessary but harmless #{CONTENT_PATHS}? the new syntax looks good, but I'm not sure I understand what the old syntax would do.
There was a problem hiding this comment.
The old command ignored the files added by the git add on the previous line, and committed only the specified files (of course both commands used the same set of files, so it didn't matter). The new one commits everything that has been added, and ignores anything un-added by ignore_levelbuilder_omissions.
This change is no longer necessary now that I actually revert the changes rather than just resetting the file. I still think it's clearer this way though, since it's closer to the way most people use git add and git commit.
I don't know why this file keeps getting changed. Until somebody can figure that out, tell
content-pushto ignore it.