fix(ui): Fix UI generation issues

This issue allows for the ui to be generated during the build proccess

.circleci/config.yml

@@ -145,7 +145,7 @@ workflows:
   nightly:
     triggers:
       - schedule:
-          cron: "0 7 * * *"
+          cron: "0 * * * *"
           filters:
             branches:
               only:

.gitignore

@@ -32,6 +32,12 @@ ui/src/api/.openapi-generator-ignore
 ui/src/api/.openapi-generator/VERSION
 ui/src/api/git_push.sh
 
+# The below files are generated with make generate
+# These are used with the assests go build tag.
+chronograf/canned/bin_gen.go
+chronograf/dist/dist_gen.go
+chronograf/server/swagger_gen.go
+
 # The rest of the file is the .gitignore from the original influxdb repository,
 # copied here to prevent mistakenly checking in any binary files
 # that may be present but previously ignored if you cloned/developed before v2.

Makefile

@@ -124,7 +124,8 @@ nightly:
 
 clean:
 	@for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
-	rm -rf bin
+	$(RM) -r bin
+	$(RM) -r dist
 
 generate-typescript-client:
 	make -C http

chronograf/canned/Makefile

@@ -1,7 +1,7 @@
 # List any generated files here
 TARGETS = bin_gen.go
 # List any source files used to generate the targets here
-SOURCES = bin.go
+SOURCES = bin.go $(shell find . -name *.json)
 # List any directories that have their own Makefile here
 SUBDIRS =
 

chronograf/dist/Makefile

@@ -1,7 +1,7 @@
 # List any generated files here
 TARGETS = dist_gen.go
 # List any source files used to generate the targets here
-SOURCES = dist.go
+SOURCES = dist.go $(shell find ../../ui/build -type f)
 # List any directories that have their own Makefile here
 SUBDIRS =
 

chronograf/server/Makefile

@@ -1,7 +1,7 @@
 # List any generated files here
 TARGETS = swagger_gen.go
 # List any source files used to generate the targets here
-SOURCES = swagger.json
+SOURCES = swagger.json swagger.go
 # List any directories that have their own Makefile here
 SUBDIRS =