From ce80f99487f0d3107a3fec98a730d5f923fb9ef5 Mon Sep 17 00:00:00 2001 From: Tim Alby Date: Mon, 13 Jan 2020 19:20:38 +0100 Subject: [PATCH] update build scripts to 1.3.1 This also completes the Node version update. --- .../.github/PULL_REQUEST_TEMPLATE.md | 5 +++- services/notifications/.nvmrc | 2 +- services/notifications/Dockerfile | 5 ++++ services/notifications/Jenkinsfile | 1 + services/notifications/Makefile | 6 +++-- services/notifications/buildscript.txt | 8 +++--- services/notifications/docker-compose.ci.yml | 14 +++++------ services/notifications/docker-compose.yml | 25 +++++++------------ 8 files changed, 36 insertions(+), 30 deletions(-) diff --git a/services/notifications/.github/PULL_REQUEST_TEMPLATE.md b/services/notifications/.github/PULL_REQUEST_TEMPLATE.md index ed25ee83c1..12bb2eeb3f 100644 --- a/services/notifications/.github/PULL_REQUEST_TEMPLATE.md +++ b/services/notifications/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,7 @@ - + + + + ### Description diff --git a/services/notifications/.nvmrc b/services/notifications/.nvmrc index bbf0c5a541..d19159826d 100644 --- a/services/notifications/.nvmrc +++ b/services/notifications/.nvmrc @@ -1 +1 @@ -6.14.1 +10.16.3 diff --git a/services/notifications/Dockerfile b/services/notifications/Dockerfile index 7656cf4526..ef0696e5ca 100644 --- a/services/notifications/Dockerfile +++ b/services/notifications/Dockerfile @@ -1,3 +1,8 @@ +# 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.3.1 + FROM node:10.16.3 as app WORKDIR /app diff --git a/services/notifications/Jenkinsfile b/services/notifications/Jenkinsfile index 43f6dc55b8..98a6156b2f 100644 --- a/services/notifications/Jenkinsfile +++ b/services/notifications/Jenkinsfile @@ -16,6 +16,7 @@ pipeline { } stages { + stage('Install') { steps { withCredentials([usernamePassword(credentialsId: 'GITHUB_INTEGRATION', usernameVariable: 'GH_AUTH_USERNAME', passwordVariable: 'GH_AUTH_PASSWORD')]) { diff --git a/services/notifications/Makefile b/services/notifications/Makefile index 1d611df09d..4201ed9d78 100644 --- a/services/notifications/Makefile +++ b/services/notifications/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.21 +# Version: 1.3.1 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -35,7 +35,8 @@ test_clean: $(DOCKER_COMPOSE) down -v -t 0 test_acceptance_pre_run: - @[ ! -f test/acceptance/scripts/pre-run ] && echo "notifications has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/scripts/pre-run + @[ ! -f test/acceptance/js/scripts/pre-run ] && echo "notifications has no pre acceptance tests task" || $(DOCKER_COMPOSE) run --rm test_acceptance test/acceptance/js/scripts/pre-run + build: docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ --tag gcr.io/overleaf-ops/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \ @@ -48,4 +49,5 @@ publish: docker push $(DOCKER_REPO)/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) + .PHONY: clean test test_unit test_acceptance test_clean build publish diff --git a/services/notifications/buildscript.txt b/services/notifications/buildscript.txt index ed8d78caa4..41bcde56a7 100644 --- a/services/notifications/buildscript.txt +++ b/services/notifications/buildscript.txt @@ -1,8 +1,10 @@ notifications +--public-repo=True --language=coffeescript ---node-version=6.14.1 +--env-add= +--node-version=10.16.3 --acceptance-creds=None --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops ---build-target=docker ---script-version=1.1.21 +--env-pass-through= +--script-version=1.3.1 diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index d2bcca9ec6..66470736dc 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/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.21 +# Version: 1.3.1 -version: "2" +version: "2.1" services: test_unit: @@ -25,13 +25,14 @@ services: MOCHA_GREP: ${MOCHA_GREP} NODE_ENV: test depends_on: - - mongo - - redis + mongo: + condition: service_healthy + redis: + condition: service_healthy user: node command: npm run test:acceptance:_run - tar: build: . image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER @@ -39,9 +40,8 @@ services: - ./:/tmp/build/ command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . user: root - redis: image: redis mongo: - image: mongo:3.4 + image: mongo:3.6 diff --git a/services/notifications/docker-compose.yml b/services/notifications/docker-compose.yml index 960e25433f..eb243ecc43 100644 --- a/services/notifications/docker-compose.yml +++ b/services/notifications/docker-compose.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.21 +# Version: 1.3.1 -version: "2" +version: "2.1" services: test_unit: @@ -18,7 +18,7 @@ services: user: node test_acceptance: - build: . + image: node:10.16.3 volumes: - .:/app working_dir: /app @@ -32,22 +32,15 @@ services: NODE_ENV: test user: node depends_on: - - mongo - - redis + mongo: + condition: service_healthy + redis: + condition: service_healthy command: npm run test:acceptance - - - tar: - build: . - image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER - volumes: - - ./:/tmp/build/ - command: tar -czf /tmp/build/build.tar.gz --exclude=build.tar.gz --exclude-vcs . - user: root - redis: image: redis mongo: - image: mongo:3.4 + image: mongo:3.6 +