From c6af21ffd6a28d7766092fe3bccd9a234096d91e Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Thu, 24 Oct 2019 16:57:08 +0100 Subject: [PATCH] Bump build script to 1.1.23 --- Makefile | 4 ++-- buildscript.txt | 3 ++- docker-compose.ci.yml | 2 +- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ceb2c50..a8a5c90 100644 --- a/Makefile +++ b/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.1.23 BUILD_NUMBER ?= local BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD) @@ -35,7 +35,7 @@ test_clean: $(DOCKER_COMPOSE) down -v -t 0 test_acceptance_pre_run: - @[ ! -f test/acceptance/scripts/pre-run ] && echo "clsi 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 "clsi 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) \ diff --git a/buildscript.txt b/buildscript.txt index 9ba22b2..acc98e3 100644 --- a/buildscript.txt +++ b/buildscript.txt @@ -4,5 +4,6 @@ clsi --acceptance-creds=None --dependencies=mongo,redis --docker-repos=gcr.io/overleaf-ops +--env-pass-through= --build-target=docker ---script-version=1.1.21 +--script-version=1.1.23 diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 39b6f42..408d88b 100644 --- a/docker-compose.ci.yml +++ b/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.21 +# Version: 1.1.23 version: "2" diff --git a/docker-compose.yml b/docker-compose.yml index 2691b89..c41d7f4 100644 --- a/docker-compose.yml +++ b/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.21 +# Version: 1.1.23 version: "2"