diff --git a/.gitignore b/.gitignore index 38bb8ac7a..f27d1de76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,9 @@ -.build -.coverage -.tests -.vscode -bindata_assetfs.go -coverage.txt -karma -ui/build -ui/coverage -ui/node_modules -vendor -TODO.md +/.build +/coverage.txt +/cmd/karma/bindata_assetfs.go +/karma +/karma-* +/ui/build +/ui/coverage +/ui/node_modules +/TODO.md diff --git a/.travis.yml b/.travis.yml index 490d74e03..5545c54bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ jobs: <<: *DEFAULTS_GO script: - travis_retry make mock-assets - - travis_retry go get -d -v + - travis_retry go get -d -v ./cmd/karma - travis_retry go mod tidy - git diff --exit-code diff --git a/Makefile b/Makefile index c64a65c94..ea756246e 100644 --- a/Makefile +++ b/Makefile @@ -48,14 +48,14 @@ endif cd ui && npm run build touch $@ -bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/artifacts-ui.ok - go-bindata-assetfs -o bindata_assetfs.go ui/build/... ui/src/... +cmd/karma/bindata_assetfs.go: .build/deps-build-go.ok .build/artifacts-bindata_assetfs.$(GO_BINDATA_MODE) .build/artifacts-ui.ok + go-bindata-assetfs -o cmd/karma/bindata_assetfs.go ui/build/... ui/src/... -$(NAME): .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES) - GO111MODULE=on go build -ldflags "-X main.version=$(VERSION)" +$(NAME): .build/deps-build-go.ok go.mod cmd/karma/bindata_assetfs.go $(SOURCES) + GO111MODULE=on go build -ldflags "-X main.version=$(VERSION)" ./cmd/karma word-split = $(word $2,$(subst -, ,$1)) -cc-%: .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES) +cc-%: .build/deps-build-go.ok go.mod cmd/karma/bindata_assetfs.go $(SOURCES) $(eval GOOS := $(call word-split,$*,1)) $(eval GOARCH := $(call word-split,$*,2)) $(eval GOARM := $(call word-split,$*,3)) @@ -63,7 +63,7 @@ cc-%: .build/deps-build-go.ok go.mod bindata_assetfs.go $(SOURCES) $(eval GOEXT := $(patsubst $(GOOS),,$(patsubst windows,.exe,$(GOOS)))) $(eval BINARY := "karma-$(GOOS)-$(GOARCH)$(GOARMBIN)$(GOEXT)") @echo $(BINARY) $(GOOS) $(GOARCH) $(GOARM) | awk '{ printf "%-25s GOOS=%-10s GOARCH=%-10s GOARM=%1s\n", $$1, $$2, $$3, $$4 }' - @env CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -o $(BINARY) -ldflags="-X main.version=$(shell make show-version)" + @env CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) go build -o $(BINARY) -ldflags="-X main.version=$(shell make show-version)" ./cmd/karma PLATFORMS := cc-darwin-386 cc-darwin-amd64 cc-dragonfly-amd64 cc-freebsd-386 cc-freebsd-amd64 cc-freebsd-arm-5 cc-freebsd-arm-6 cc-freebsd-arm-7 cc-linux-386 cc-linux-amd64 cc-linux-arm-5 cc-linux-arm-6 cc-linux-arm-7 cc-linux-arm64 cc-linux-ppc64 cc-linux-ppc64le cc-linux-mips cc-linux-mipsle cc-linux-mips64 cc-linux-mips64le cc-linux-s390x cc-netbsd-386 cc-netbsd-amd64 cc-netbsd-arm-5 cc-netbsd-arm-6 cc-netbsd-arm-7 cc-openbsd-386 cc-openbsd-amd64 cc-openbsd-arm-5 cc-openbsd-arm-6 cc-openbsd-arm-7 cc-solaris-amd64 cc-windows-386 cc-windows-amd64 crosscompile: $(PLATFORMS) @@ -71,7 +71,7 @@ crosscompile: $(PLATFORMS) .PHONY: clean clean: - rm -fr .build bindata_assetfs.go $(NAME) ui/build ui/node_modules coverage.txt + rm -fr .build cmd/karma/bindata_assetfs.go $(NAME) ui/build ui/node_modules coverage.txt .PHONY: run run: $(NAME) @@ -164,7 +164,7 @@ mock-assets: .build/deps-build-go.ok rm -fr ui/build mkdir ui/build cp ui/public/* ui/build/ - go-bindata-assetfs -o bindata_assetfs.go -nometadata ui/build/... + go-bindata-assetfs -o cmd/karma/bindata_assetfs.go -nometadata ui/build/... # force assets rebuild on next make run rm -f .build/bindata_assetfs.* diff --git a/alerts.go b/cmd/karma/alerts.go similarity index 100% rename from alerts.go rename to cmd/karma/alerts.go diff --git a/api_test.go b/cmd/karma/api_test.go similarity index 100% rename from api_test.go rename to cmd/karma/api_test.go diff --git a/assets.go b/cmd/karma/assets.go similarity index 100% rename from assets.go rename to cmd/karma/assets.go diff --git a/assets_test.go b/cmd/karma/assets_test.go similarity index 97% rename from assets_test.go rename to cmd/karma/assets_test.go index bf7e28b6f..a899dcc35 100644 --- a/assets_test.go +++ b/cmd/karma/assets_test.go @@ -45,14 +45,14 @@ func TestCustomizationAssets(t *testing.T) { mime: "text/css", }, { - customJS: "ui/.env", + customJS: "../../ui/.env", path: "/custom.js", code: 200, body: "PUBLIC_URL=.\n", mime: "text/plain; charset=utf-8", }, { - customCSS: "ui/.env", + customCSS: "../../ui/.env", path: "/custom.css", code: 200, body: "PUBLIC_URL=.\n", diff --git a/autocomplete.go b/cmd/karma/autocomplete.go similarity index 100% rename from autocomplete.go rename to cmd/karma/autocomplete.go diff --git a/autocomplete_test.go b/cmd/karma/autocomplete_test.go similarity index 100% rename from autocomplete_test.go rename to cmd/karma/autocomplete_test.go diff --git a/main.go b/cmd/karma/main.go similarity index 100% rename from main.go rename to cmd/karma/main.go diff --git a/main_test.go b/cmd/karma/main_test.go similarity index 100% rename from main_test.go rename to cmd/karma/main_test.go diff --git a/metrics.go b/cmd/karma/metrics.go similarity index 100% rename from metrics.go rename to cmd/karma/metrics.go diff --git a/proxy.go b/cmd/karma/proxy.go similarity index 100% rename from proxy.go rename to cmd/karma/proxy.go diff --git a/proxy_test.go b/cmd/karma/proxy_test.go similarity index 100% rename from proxy_test.go rename to cmd/karma/proxy_test.go diff --git a/timer.go b/cmd/karma/timer.go similarity index 100% rename from timer.go rename to cmd/karma/timer.go diff --git a/views.go b/cmd/karma/views.go similarity index 100% rename from views.go rename to cmd/karma/views.go diff --git a/views_test.go b/cmd/karma/views_test.go similarity index 100% rename from views_test.go rename to cmd/karma/views_test.go