From 4e61528ad5a2e217b7a309276c69cf73070541c2 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Fri, 15 Sep 2017 13:32:25 -0500 Subject: [PATCH] add Chrome v61.0 to build images --- .gitlab-ci.yml | 3 ++- scripts/custom-docker-build | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a719c5c..fdc45bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,7 @@ ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6 test: *test_custom ruby-2.3.3-golang-1.8-git-2.13-chrome-60.0-node-7.1-postgresql-9.6 test: *test_custom ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_custom +ruby-2.4.1-golang-1.8-git-2.13-chrome-61.0-node-7.1-postgresql-9.6 test: *test_custom golang-1.8-git-2.8.4 test: *test_custom golang-1.8-git-2.13 test: *test_custom @@ -86,6 +87,7 @@ ruby-2.3.3-golang-1.8-git-2.13-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6: *build_and_deploy_custom ruby-2.3.3-golang-1.8-git-2.13-chrome-60.0-node-7.1-postgresql-9.6: *build_and_deploy_custom ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy_custom +ruby-2.4.1-golang-1.8-git-2.13-chrome-61.0-node-7.1-postgresql-9.6: *build_and_deploy_custom golang-1.8-git-2.8.4: *build_and_deploy_custom golang-1.8-git-2.13: *build_and_deploy_custom @@ -100,4 +102,3 @@ omnibus-gitlab-opensuse42.2: *build_and_deploy omnibus-gitlab-trusty: *build_and_deploy omnibus-gitlab-wheezy: *build_and_deploy omnibus-gitlab-xenial: *build_and_deploy - diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index a1c26ae..172129c 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -20,6 +20,7 @@ function print_golang_args() { function print_chrome_args() { case "$1" in 60|60.0) CHROME_VERSION=60.0.3112.90-1 ;; + 61|61.0) CHROME_VERSION=61.0.3163.91-1 ;; *) echo "Unknown chrome version $1"; exit 1; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"