build, ui: fix make watch#26371
Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom Jun 4, 2018
Merged
Conversation
In cockroachdb#26148 the make watch task was missed. This updates that to run with the new webpack config. Release note: None
Member
|
This change is |
vilterp
approved these changes
Jun 4, 2018
Contributor
vilterp
left a comment
There was a problem hiding this comment.
Tested locally; fixes the problem 👍
benesch
reviewed
Jun 4, 2018
Makefile
Outdated
| @@ -1198,7 +1198,7 @@ ui-watch-secure: export TARGET ?= https://localhost:8080/ | |||
| ui-watch: export TARGET ?= http://localhost:8080 | |||
| ui-watch ui-watch-secure: PORT := 3000 | |||
| ui-watch ui-watch-secure: $(UI_DLLS) pkg/ui/yarn.opt.installed | |||
Contributor
There was a problem hiding this comment.
s/UI_DLLS/UI_CCL_DLLS/
(what I would give for some type safety in Make)
The make watch target runs the CCL build, so it should depend on the CCL versions of the DLL files. Release note: None
Contributor
Author
|
bors r+ |
Contributor
Build succeeded |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
In #26148 the make watch task was missed. This updates that to run with
the new webpack config.
Release note: None