From 2bd55991586511167d785e5948c735d59afd20f2 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 19 May 2018 23:08:09 -0700 Subject: [PATCH 1/2] Add missing Gitaly builds for git 2.16 and Ruby 2.4.4 --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 703aae5..fe7f43a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,12 +53,13 @@ before_script: # Tests # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml -ruby-2.3-golang-1.9-git-2.16 test: *test_custom -ruby-2.3-golang-1.9-git-2.14 test: *test_custom ruby-2.3-golang-1.9-git-2.9 test: *test_custom -ruby-2.3-golang-1.10-git-2.14 test: *test_custom +ruby-2.3-golang-1.9-git-2.14 test: *test_custom +ruby-2.3-golang-1.9-git-2.16 test: *test_custom ruby-2.3-golang-1.10-git-2.9 test: *test_custom +ruby-2.3-golang-1.10-git-2.14 test: *test_custom ruby-2.3-golang-1.10-git-2.16 test: *test_custom +ruby-2.4-golang-1.9-git-2.16 test: *test_custom ruby-2.4-golang-1.9-git-2.17 test: *test_custom ruby-2.4-golang-1.10-git-2.16 test: *test_custom ruby-2.4-golang-1.10-git-2.17 test: *test_custom @@ -109,6 +110,7 @@ ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom +ruby-2.4-golang-1.9-git-2.16: *build_and_deploy_custom ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom From b47eefb79be5e7f61d701238eb5c5b126cad0061 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 19 May 2018 23:09:01 -0700 Subject: [PATCH 2/2] Sort images --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe7f43a..04f711b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,13 +103,13 @@ sitespeed-gitlab test: *test_build # Builds # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml +ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.16: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.17: *build_and_deploy_custom -ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom +ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom -ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom ruby-2.4-golang-1.9-git-2.16: *build_and_deploy_custom ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom