Merge branch 'develop'

programmfabrik · Jun 9, 2020 · 16a8dd7 · 16a8dd7
2 parents 184e6c5 + 53dc0d1
commit 16a8dd7
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,5 @@ tmpl.go
 apitest_report.json
 /commands/server/assets/tmpl.go
 *.code-workspace
-/bin/
 *.vscode
 *.sh
diff --git a/Makefile b/Makefile
@@ -1,8 +1,3 @@
-GITCOMMIT=`git log --pretty=format:'%h' -n 1`
-BUILDTIMESTAMP=`date -u +%d.%m.%Y_%H:%M:%S_%Z`
-GITVERSIONTAG=`git tag -l 'v*' | tail -1`
-LDFLAGS=-ldflags "-X main.buildTimeStamp=${BUILDTIMESTAMP} -X main.gitVersion=${GITVERSIONTAG} -X main.gitCommit=${GITCOMMIT}"
-
 all: generate build
 
 generate:
@@ -12,11 +7,7 @@ test: generate
 	go vet ./...
 	go test ./...
 
-gox: generate
-	go get github.com/mitchellh/gox
-	gox ${LDFLAGS} -parallel=4 -output="./bin/apitest_{{.OS}}_{{.Arch}}" ./cmd/apitest/
-
 build:
-	go build ${LDFLAGS} -o ./bin/apitest ./cmd/apitest/
+	go build
 
-.PHONY: all generate test gox build
+.PHONY: all generate test build
diff --git a/cmd/apitest/api_testcase.go → api_testcase.go b/cmd/apitest/api_testcase.go → api_testcase.go
diff --git a/cmd/apitest/api_testcase_test.go → api_testcase_test.go b/cmd/apitest/api_testcase_test.go → api_testcase_test.go
diff --git a/cmd/apitest/api_testsuite.go → api_testsuite.go b/cmd/apitest/api_testsuite.go → api_testsuite.go
diff --git a/cmd/apitest/api_testsuite_test.go → api_testsuite_test.go b/cmd/apitest/api_testsuite_test.go → api_testsuite_test.go
diff --git a/cmd/apitest/apitest.tmp.yml → apitest.tmp.yml b/cmd/apitest/apitest.tmp.yml → apitest.tmp.yml
diff --git a/cmd/apitest/config.go → config.go b/cmd/apitest/config.go → config.go
diff --git a/cmd/apitest/config_test.go → config_test.go b/cmd/apitest/config_test.go → config_test.go
diff --git a/cmd/apitest/http_server.go → http_server.go b/cmd/apitest/http_server.go → http_server.go
diff --git a/cmd/apitest/main.go → main.go b/cmd/apitest/main.go → main.go