From a3d18021ec2ba1e4094092f0826e05a8e51a57d1 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 8 Jun 2018 10:46:13 -0700 Subject: [PATCH] Bump to Chrome V67 --- .gitlab-ci.yml | 8 ++++---- scripts/custom-docker-build | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b658b13..92c9c65 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,9 +71,9 @@ ruby-2.4-golang-1.10-git-2.17 test: *test_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom # Not used anymore (?) golang-1.9-git-2.9.0 test: *test_custom @@ -126,8 +126,8 @@ ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.17-chrome-66.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index c702269..db0cbd3 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -56,7 +56,11 @@ function print_chrome_args() { ;; 66|66.0) CHROME_VERSION=66.0.3359.181-1 - CHROME_DRIVER_VERSION=2.38 + CHROME_DRIVER_VERSION=2.40 + ;; + 67|67.0) + CHROME_VERSION=67.0.3396.79-1 + CHROME_DRIVER_VERSION=2.40 ;; *) echo "Unknown chrome version $1"; exit 1; esac