github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

update build scripts to 1.1.16

Browse source
This commit is contained in:
Tim Alby 2019-03-11 10:28:18 -05:00
parent 2a68ddca6e
commit 7586bb5dcb
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/chat/Jenkinsfile vendored
View file

@ -35,6 +35,11 @@ pipeline {
sh 'make build' sh 'make build'
} }
} }
stage('Linting') {
steps {
sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make lint'
}
}
stage('Unit Tests') { stage('Unit Tests') {
steps { steps {

6
services/chat/Makefile
View file

@ -1,7 +1,7 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.12 # Version: 1.1.16
BUILD_NUMBER ?= local BUILD_NUMBER ?= local
BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
@ -24,7 +24,9 @@ test: lint test_unit test_acceptance
test_unit: test_unit:
@[ ! -d test/unit ] && echo "chat has no unit tests" || $(DOCKER_COMPOSE) run --rm 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 @[ ! -d test/acceptance ] && echo "chat has no acceptance tests" || $(DOCKER_COMPOSE) run --rm test_acceptance
test_clean: test_clean:

2
services/chat/buildscript.txt
View file

@ -5,4 +5,4 @@ chat
--dependencies=mongo,redis --dependencies=mongo,redis
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--build-target=docker --build-target=docker
--script-version=1.1.12 --script-version=1.1.16

4
services/chat/docker-compose.ci.yml
View file

@ -1,9 +1,9 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.12 # Version: 1.1.16
version: "2" version: "3.1"
services: services:
test_unit: test_unit:

6
services/chat/docker-compose.yml
View file

@ -1,13 +1,13 @@
# This file was auto-generated, do not edit it directly. # This file was auto-generated, do not edit it directly.
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
# Version: 1.1.12 # Version: 1.1.16
version: "2" version: "3.1"
services: services:
test_unit: test_unit:
build: . image: node:6.14.1
volumes: volumes:
- .:/app - .:/app
working_dir: /app working_dir: /app