From c43ce93dcd98ea726c74da7ac4bbc7ad0600b78a Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sun, 2 Jun 2019 22:50:16 -0700 Subject: [PATCH] Upgrade www-gitlab-com dependencies 1. Ruby 2.6.3 2. Chrome V74 3. Git 2.21 --- .gitlab-ci.yml | 2 ++ scripts/custom-docker-build | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a2cc66..ffd5dbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,6 +71,7 @@ ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker- # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom +ruby-2.6.3-git-2.21-chrome-74.0-docker-18.06.1 test: *test_custom # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom @@ -116,6 +117,7 @@ ruby-2.6.3-git-2.21-chrome-73.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker- # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom +ruby-2.6.3-git-2.21-chrome-74.0-docker-18.06.1: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 52d5281..02194e6 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -46,6 +46,10 @@ function print_chrome_args() { CHROME_VERSION=73.0.3683.103-1 CHROME_DRIVER_VERSION=73.0.3683.68 ;; + 74|74.0) + CHROME_VERSION=74.0.3729.169-1 + CHROME_DRIVER_VERSION=74.0.3729.6 + ;; *) echo "Unknown chrome version $1"; exit 1; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"