From f6ad6999e98b5f454c8d1d2fdc8fc13b25d25451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Wed, 24 Jan 2018 17:55:15 -0300 Subject: [PATCH 1/2] Update to chrome 64 --- .gitlab-ci.yml | 12 ++++++------ scripts/custom-docker-build | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38f1fe0..eebd52b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,11 +49,11 @@ before_script: ruby-2.3-golang-1.9-git-2.14 test: *test_custom ruby-2.3-golang-1.9-git-2.8 test: *test_custom -ruby-2.3.5-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom golang-1.9-git-2.8.4 test: *test_custom golang-1.9-git-2.14 test: *test_custom -node-8.9-chrome-63.0-yarn-1.2 test: *test_custom +node-8.9-chrome-64.0-yarn-1.2 test: *test_custom www-gitlab-com test: *test_build gitlab-qa test: *test_build @@ -70,11 +70,11 @@ omnibus-gitlab-xenial test: *test_build ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.8: *build_and_deploy_custom -ruby-2.3.5-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom golang-1.9-git-2.8.4: *build_and_deploy_custom golang-1.9-git-2.14: *build_and_deploy_custom -node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom +node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom www-gitlab-com: *build_and_deploy gitlab-qa: *build_and_deploy diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index fadaa3e..687b884 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -27,6 +27,7 @@ function print_chrome_args() { 61|61.0) CHROME_VERSION=61.0.3163.100-1 ;; 62|62.0) CHROME_VERSION=62.0.3202.89-1 ;; 63|63.0) CHROME_VERSION=63.0.3239.108-1 ;; + 64|64.0) CHROME_VERSION=64.0.3282.119-1 ;; *) echo "Unknown chrome version $1"; exit 1; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" From 48fbcc58113e81ed0a90195a849fb30a7b3bb15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= Date: Wed, 24 Jan 2018 16:14:56 +0000 Subject: [PATCH 2/2] Update minimum git version images to git 2.9.0 See https://gitlab.com/gitlab-org/gitaly/merge_requests/548 --- .gitlab-ci.yml | 8 ++++---- scripts/custom-docker-build | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eebd52b..31c88f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,10 +48,10 @@ before_script: # Tests ruby-2.3-golang-1.9-git-2.14 test: *test_custom -ruby-2.3-golang-1.9-git-2.8 test: *test_custom +ruby-2.3-golang-1.9-git-2.9 test: *test_custom ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -golang-1.9-git-2.8.4 test: *test_custom +golang-1.9-git-2.9.0 test: *test_custom golang-1.9-git-2.14 test: *test_custom node-8.9-chrome-64.0-yarn-1.2 test: *test_custom @@ -69,10 +69,10 @@ omnibus-gitlab-xenial test: *test_build # Builds ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom -ruby-2.3-golang-1.9-git-2.8: *build_and_deploy_custom +ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -golang-1.9-git-2.8.4: *build_and_deploy_custom +golang-1.9-git-2.9.0: *build_and_deploy_custom golang-1.9-git-2.14: *build_and_deploy_custom node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 687b884..736a632 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -44,6 +44,10 @@ function print_git_args() { GIT_VERSION=2.8.4 GIT_DOWNLOAD_SHA256=626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301 ;; + 2.9|2.9.0) + GIT_VERSION=2.9.0 + GIT_DOWNLOAD_SHA256=bff7560f5602fcd8e37669e0f65ef08c6edc996e4f324e4ed6bb8a84765e30bd + ;; 2.13) GIT_VERSION=2.13.6 GIT_DOWNLOAD_SHA256=cb53e6b388d8d19189933366c1fe5c1ca500e8b227b9e707af39c3d879e41015