Fix file generation in Makefile

Signed-off-by: Tobias Guggenmos <tobias.guggenmos@uni-ulm.de>
prometheus-community · May 12, 2020 · d964104 · d964104
1 parent 87ea686
commit d964104
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -76,8 +76,8 @@ jobs:
 
     steps:
       - checkout
-      - run: go get github.com/rakyll/statik@v0.1.7
-      - run: make clean
+    # - run: go get github.com/rakyll/statik@v0.1.7
+    # - run: make clean
     # - run: make generated
     # - run: bash -c "[[ `(git diff ; git add -fAn) | wc -l` -eq 0 ]] || ( git --no-pager diff; git add -fAn; echo Please run 'make generated' and commit again ; exit 1 )"
       - run: make fmt

diff --git a/Makefile b/Makefile
@@ -10,24 +10,24 @@ BINARYS := $(patsubst cmd/%.go, %, $(MAIN_GO_FILES))
 all: build test golangci-lint
 
 generated: $(STATIK_FILES)
-	gofmt -w $(STATIK_FILES)
 
 
 .PHONY: install
 install: $(STATIK_FILES)
 	$(GO) get ./cmd/...
 
 .PHONY: build
-build: $(STATIK_FILES)
+build:
 	$(GO) build ./cmd/...
 
 .PHONY: clean
 clean: 
 	rm -f $(STATIK_FILES)
 	rm -f $(BINARYS)
 
-%_statik/statik.go: $(wildcard $*/*.md)
+%_statik/statik.go: $(wildcard $*/*)
 	statik -src "$*" -dest $(dir $*) -p $(notdir $*_statik) -f -m
+	gofmt -w $@
 
 .PHONY: fmt
 fmt:

diff --git a/langserver/documentation/functions_statik/statik.go b/langserver/documentation/functions_statik/statik.go