diff --git a/services/chat/Jenkinsfile b/services/chat/Jenkinsfile index b73f81170b..383767d799 100644 --- a/services/chat/Jenkinsfile +++ b/services/chat/Jenkinsfile @@ -35,6 +35,11 @@ pipeline { sh 'make build' } } + stage('Linting') { + steps { + sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make lint' + } + } stage('Unit Tests') { steps { diff --git a/services/chat/Makefile b/services/chat/Makefile index 32cce58814..e0752710bc 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -1,7 +1,7 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.12 +# Version: 1.1.16 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -24,7 +24,9 @@ test: lint test_unit test_acceptance test_unit: @[ ! -d test/unit ] && echo "chat has no unit tests" || $(DOCKER_COMPOSE) run --rm test_unit -test_acceptance: test_clean test_acceptance_pre_run # clear the database before each acceptance test run +test_acceptance: test_clean test_acceptance_pre_run test_acceptance_run + +test_acceptance_run: @[ ! -d test/acceptance ] && echo "chat has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance test_clean: diff --git a/services/chat/buildscript.txt b/services/chat/buildscript.txt index d548480e6a..82030826ac 100644 --- a/services/chat/buildscript.txt +++ b/services/chat/buildscript.txt @@ -5,4 +5,4 @@ chat --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops --build-target=docker ---script-version=1.1.12 +--script-version=1.1.16 diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml index 36b52f8f8b..c8483690aa 100644 --- a/services/chat/docker-compose.ci.yml +++ b/services/chat/docker-compose.ci.yml @@ -1,9 +1,9 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.12 +# Version: 1.1.16 -version: "2" +version: "3.1" services: test_unit: diff --git a/services/chat/docker-compose.yml b/services/chat/docker-compose.yml index 8bb7857cb6..4bb6169578 100644 --- a/services/chat/docker-compose.yml +++ b/services/chat/docker-compose.yml @@ -1,13 +1,13 @@ # This file was auto-generated, do not edit it directly. # Instead run bin/update_build_scripts from # https://github.com/sharelatex/sharelatex-dev-environment -# Version: 1.1.12 +# Version: 1.1.16 -version: "2" +version: "3.1" services: test_unit: - build: . + image: node:6.14.1 volumes: - .:/app working_dir: /app