From ff9e67c87d7f3c0b519d7b339d9ba54cf4b17a97 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 29 May 2018 13:59:19 +0100 Subject: [PATCH] Update to Build Script 1.1.4 (draft) --- services/docstore/Jenkinsfile | 3 +-- services/docstore/Makefile | 4 ++-- services/docstore/docker-compose.ci.yml | 2 +- services/docstore/docker-compose.yml | 4 ++-- services/docstore/package.json | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/services/docstore/Jenkinsfile b/services/docstore/Jenkinsfile index 0b72053319..e8eefc2e9d 100644 --- a/services/docstore/Jenkinsfile +++ b/services/docstore/Jenkinsfile @@ -2,7 +2,7 @@ String cron_string = BRANCH_NAME == "master" ? "@daily" : "" pipeline { agent any - + triggers { pollSCM('* * * * *') cron(cron_string) @@ -29,7 +29,6 @@ pipeline { } } - stage('Package and publish build') { steps { sh 'make publish' diff --git a/services/docstore/Makefile b/services/docstore/Makefile index bc197fbdee..2c1273ffc4 100644 --- a/services/docstore/Makefile +++ b/services/docstore/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.3 +# Version: 1.1.4 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -14,7 +14,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ AWS_BUCKET=${AWS_BUCKET} \ AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ - docker-compose ${DOCKER_COMPOSE_FLAGS} + docker-compose ${DOCKER_COMPOSE_FLAGS} clean: diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml index 4d7273edf7..b82ec852ac 100644 --- a/services/docstore/docker-compose.ci.yml +++ b/services/docstore/docker-compose.ci.yml @@ -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.3 +# Version: 1.1.4 version: "2" diff --git a/services/docstore/docker-compose.yml b/services/docstore/docker-compose.yml index 31fe46d3ed..fd540dae99 100644 --- a/services/docstore/docker-compose.yml +++ b/services/docstore/docker-compose.yml @@ -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.3 +# Version: 1.1.4 version: "2" @@ -25,8 +25,8 @@ services: REDIS_HOST: redis MONGO_HOST: mongo POSTGRES_HOST: postgres - AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID} + AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY} AWS_BUCKET: ${AWS_BUCKET} MOCHA_GREP: ${MOCHA_GREP} user: node diff --git a/services/docstore/package.json b/services/docstore/package.json index 3249de833a..88e56d9d37 100644 --- a/services/docstore/package.json +++ b/services/docstore/package.json @@ -12,7 +12,7 @@ "start": "npm run compile:app && node $NODE_APP_OPTIONS app.js", "test:acceptance:_run": "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY AWS_BUCKET=$AWS_BUCKET AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js", "test:acceptance": "npm run compile:app && npm run compile:acceptance_tests && npm run test:acceptance:_run -- --grep=$MOCHA_GREP", - "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js", + "test:unit:_run": "mocha --recursive --reporter spec --exit $@ test/unit/js", "test:unit": "npm run compile:app && npm run compile:unit_tests && npm run test:unit:_run -- --grep=$MOCHA_GREP", "compile:unit_tests": "[ ! -e test/unit/coffee ] && echo 'No unit tests to compile' || coffee -o test/unit/js -c test/unit/coffee", "compile:acceptance_tests": "[ ! -e test/acceptance/coffee ] && echo 'No acceptance tests to compile' || coffee -o test/acceptance/js -c test/acceptance/coffee",