fix: bail webpack build on tsc error (#16573)

pull/16580/head
Alex Boatwright 2020-01-16 15:01:53 -08:00 committed by GitHub
parent d00755379b
commit 4362072afb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -68,12 +68,12 @@ ifeq ($(GOARCH), arm64)
else
all: GO_ARGS=-tags 'assets $(GO_TAGS)'
endif
all: subdirs generate $(CMDS)
all: $(SUBDIRS) generate $(CMDS)
# Target to build subdirs.
# Each subdirs must support the `all` target.
subdirs: $(SUBDIRS)
@for d in $^; do $(MAKE) -C $$d all; done
$(SUBDIRS):
$(MAKE) -C $@ all
#
# Define targets for commands
@ -135,7 +135,7 @@ checkgenerate:
checkcommit:
./etc/circle-detect-committed-binaries.sh
generate: subdirs
generate: $(SUBDIRS)
test-js: node_modules
make -C ui test
@ -191,7 +191,7 @@ define CHRONOGIRAFFE
," ## /
endef
export CHRONOGIRAFFE
chronogiraffe: subdirs generate $(CMDS)
chronogiraffe: $(SUBDIRS) generate $(CMDS)
@echo "$$CHRONOGIRAFFE"
run: chronogiraffe
@ -207,4 +207,4 @@ protoc:
chmod +x /go/bin/protoc
# .PHONY targets represent actions that do not create an actual file.
.PHONY: all subdirs $(SUBDIRS) run fmt checkfmt tidy checktidy checkgenerate test test-go test-js test-go-race bench clean node_modules vet nightly chronogiraffe dist ping protoc e2e run-e2e influxd libflux
.PHONY: all $(SUBDIRS) run fmt checkfmt tidy checktidy checkgenerate test test-go test-js test-go-race bench clean node_modules vet nightly chronogiraffe dist ping protoc e2e run-e2e influxd libflux

View File

@ -22,7 +22,7 @@
"start:dev-cloud": "cross-env CLOUD_LOGOUT_URL=http://localhost:8080/api/v2/signout CLOUD_URL=http://localhost:9999 webpack-dev-server --config ./webpack.dev.ts",
"start:docker": "yarn generate && yarn build:vendor && yarn run start:dev",
"build": "yarn install --silent && yarn build:ci",
"build:ci": "yarn generate && yarn build:vendor && webpack --config webpack.prod.ts",
"build:ci": "yarn generate && yarn build:vendor && webpack --config webpack.prod.ts --bail",
"build:vendor": "webpack --config webpack.vendor.ts",
"clean": "rm -rf ./build && rm -rf ./.cache && rm -rf node_modules && rm -rf cypress/screenshots && rm -rf cypress/videos && rm -f junit-results/* ",
"test": "jest --maxWorkers=2",