Fix version file generation, remove master deploys from travis

This commit is contained in:
bandesz
2016-08-23 13:35:48 +01:00
parent 270451e7ba
commit f113309713
2 changed files with 6 additions and 44 deletions

View File

@@ -105,6 +105,9 @@ build-with-docker: prepare-docker-build-image ## Build inside a Docker container
--name "${DOCKER_CONTAINER_PREFIX}-build" \
-v `pwd`:/var/project \
-v ${PIP_ACCEL_CACHE}:/var/project/cache/pip-accel \
-e GIT_COMMIT=${GIT_COMMIT} \
-e BUILD_NUMBER=${BUILD_NUMBER} \
-e BUILD_URL=${BUILD_URL} \
${DOCKER_BUILDER_IMAGE_NAME} \
make build
@@ -114,6 +117,9 @@ test-with-docker: prepare-docker-build-image create-docker-test-db ## Run tests
--name "${DOCKER_CONTAINER_PREFIX}-test" \
--link "${DOCKER_CONTAINER_PREFIX}-db:postgres" \
-e TEST_DATABASE=postgresql://postgres:postgres@postgres/test_notification_api \
-e GIT_COMMIT=${GIT_COMMIT} \
-e BUILD_NUMBER=${BUILD_NUMBER} \
-e BUILD_URL=${BUILD_URL} \
-v `pwd`:/var/project \
${DOCKER_BUILDER_IMAGE_NAME} \
make test