diff options
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c9ee6980..ef28688f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 stages: - build @@ -7,7 +7,7 @@ stages: variables: DOCKER_DRIVER: overlay - CUSTOM_IMAGE_VERSION: ruby-2.4-golang-1.9-git-2.18 + CUSTOM_IMAGE_VERSION: ruby-2.4-golang-1.11-git-2.18 verify: stage: test @@ -83,10 +83,6 @@ build:go1.10: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 -build:go1.9: - <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.18 - binaries_go1.11: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 @@ -95,33 +91,13 @@ binaries_go1.10: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 -binaries_go1.9: - <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.18 - -binaries_go1.9: - <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.18 - test:default: <<: *test_definition -test:go1.9-git2.9-ruby-2.4: - <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.9 - -test:go1.9-git2.18-ruby-2.4: - <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.18 - test:go1.10-git2.18-ruby-2.4: <<: *test_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 -test:go1.11-git2.18-ruby-2.4: - <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 - race: <<: *go_test_definition script: |