diff --git a/Makefile b/Makefile index a0aceaad..afc8ba16 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ XGO=GOPATH=$(GOPATH) xgo -go 1.11 --dest=build BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" RICE=$(GOPATH)/bin/rice PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH) -PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }' +PUBLISH_BODY='{ "request": { "branch": "master", "message": "Homebrew update version v${VERSION}", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }' TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "os": [ "linux" ], "language": "go", "go": [ "1.10.x" ], "go_import_path": "github.com/hunterlong/statping", "install": true, "sudo": "required", "services": [ "docker" ], "env": { "VERSION": "${VERSION}" }, "matrix": { "allow_failures": [ { "go": "master" } ], "fast_finish": true }, "before_deploy": [ "git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [ { "provider": "releases", "api_key": "$(GH_TOKEN)", "file_glob": true, "file": "build/*", "skip_cleanup": true } ], "notifications": { "email": false }, "before_script": ["gem install sass"], "script": [ "wget -O statping.gpg $(SIGN_URL)", "gpg --import statping.gpg", "travis_wait 30 docker pull karalabe/xgo-latest", "make release" ], "after_success": [], "after_deploy": [ "make publish-homebrew" ] } } }' TEST_DIR=$(GOPATH)/src/github.com/hunterlong/statping PATH:=$(PATH) @@ -245,6 +245,7 @@ clean: find . -name "*.out" -type f -delete find . -name "*.cpu" -type f -delete find . -name "*.mem" -type f -delete + rm -rf build # tag version using git tag: diff --git a/dev/Dockerfile.test b/dev/Dockerfile.test deleted file mode 100644 index 5aae206c..00000000 --- a/dev/Dockerfile.test +++ /dev/null @@ -1,7 +0,0 @@ -FROM postman/newman - -WORKDIR /app -ADD dev/postman_environment.json /app/ -ADD source/tmpl/postman.json /app/ - -ENTRYPOINT sleep 15 && newman run /app/postman.json -e /app/postman_environment.json \ No newline at end of file diff --git a/dev/docker-compose.test.yml b/dev/docker-compose.test.yml deleted file mode 100644 index ae9b9c86..00000000 --- a/dev/docker-compose.test.yml +++ /dev/null @@ -1,12 +0,0 @@ -sut: - container_name: statping_sut - build: . - dockerfile: Dockerfile.test - links: - - statping -statping: - build: . - dockerfile: Dockerfile - environment: - DB_CONN: sqlite - NAME: Docker Tester