Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjramsay <git@zjvandeweg.nl>2019-11-15 17:07:44 +0300
committerjramsay <git@zjvandeweg.nl>2019-11-15 17:07:45 +0300
commit5275939797618b4789508c3c94b4c3ebae756b45 (patch)
treec3c954ae9840cf649056351f3206d9bab96fe47e
parent5b8ea5450f5eb2323d2359b21da381519ca0a401 (diff)
Drop support for Go 1.11
Closes: https://gitlab.com/gitlab-org/gitaly/issues/2076
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--Dockerfile2
-rw-r--r--README.md2
-rw-r--r--_support/instrumented-cluster/docker-compose.yml2
-rw-r--r--proto/README.md2
-rw-r--r--ruby/gitlab-shell/.gitlab-ci.yml4
6 files changed, 4 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12b07047b..392ce2907 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,10 +102,6 @@ build:go1.12:
<<: *build_definition
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21
-build:go1.11:
- <<: *build_definition
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21
-
binaries_go1.13:
<<: *assemble_definition
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22
@@ -114,10 +110,6 @@ binaries_go1.12:
<<: *assemble_definition
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21
-binaries_go1.11:
- <<: *assemble_definition
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21
-
test:go1.13-git-2.22-ruby-2.6:
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22
<<: *test_definition
@@ -130,10 +122,6 @@ test:go1.12-git-2.21-ruby-2.6:
image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21
<<: *test_definition
-test:go1.11-git-2.21-ruby-2.6:
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21
- <<: *test_definition
-
test:proxy:
<<: *test_definition
script:
diff --git a/Dockerfile b/Dockerfile
index b2976948a..32b36f8ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
# See the _support/load-cluster/docker-compose.yml for an example of how to use
# this image
#
-FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.22
RUN mkdir -p /app/ruby
diff --git a/README.md b/README.md
index b999c0d4f..018c7f973 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ GitLab.com, read about our [observibiltiy story](doc/observibility.md)!
Most users won't install Gitaly on its own. It is already included in
[your GitLab installation](https://about.gitlab.com/install/).
-Gitaly requires Go 1.11.4 or newer and Ruby 2.5. Run `make` to download
+Gitaly requires Go 1.12.13 or newer and Ruby 2.6. Run `make` to download
and compile Ruby dependencies, and to compile the Gitaly Go
executable.
diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml
index 1478bf7a5..51e0719ce 100644
--- a/_support/instrumented-cluster/docker-compose.yml
+++ b/_support/instrumented-cluster/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
services:
gitaly1repos:
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.18
+ image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.22
volumes:
- gitalydata1:/repositories
- ./gitaly1repos/setup.sh:/setup.sh
diff --git a/proto/README.md b/proto/README.md
index 0b24bfcb7..40d93c278 100644
--- a/proto/README.md
+++ b/proto/README.md
@@ -274,7 +274,7 @@ files but not the client libraries. This check uses `git diff` to look
for changes. Some of the code in the Go client libraries is sensitive
to implementation details of the Go standard library (specifically,
the output of gzip). **Use the same Go version as .gitlab-ci.yml (Go
-1.11)** when generating new client libraries for a merge request.
+1.12)** when generating new client libraries for a merge request.
[DCO + License](CONTRIBUTING.md)
diff --git a/ruby/gitlab-shell/.gitlab-ci.yml b/ruby/gitlab-shell/.gitlab-ci.yml
index 72b886427..7ffbee0b0 100644
--- a/ruby/gitlab-shell/.gitlab-ci.yml
+++ b/ruby/gitlab-shell/.gitlab-ci.yml
@@ -82,10 +82,6 @@ go:1.10:
<<: *go_definition
image: golang:1.10
-go:1.11:
- <<: *go_definition
- image: golang:1.10
-
codequality:
image: docker:stable
variables: