diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-03-29 02:00:49 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-03-29 02:00:49 +0300 |
| commit | b2335569444153a38e82dd8d4e9228465f9274ca (patch) | |
| tree | b0da17efe45beaff4db3350a41afd739ff3edf2e | |
| parent | 35c7b104140fcc6e0549b886dc40bc8c7cc5d3f5 (diff) | |
| parent | d244a2974c6bb901eceb4c987ff9295336bc9443 (diff) | |
Merge branch 'zj-drop-go-1-10' into 'master'
Drop support for Golang 1.10
Closes #1516
See merge request gitlab-org/gitaly!1149
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-drop-go-1-10.yml | 5 |
3 files changed, 8 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c209e345..b0ee4d885 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,10 +86,6 @@ build:go1.11: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 -build:go1.10: - <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 - binaries_go1.12: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 @@ -98,10 +94,6 @@ binaries_go1.11: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 -binaries_go1.10: - <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 - test:go1.12-git-2.21-ruby-2.5: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 <<: *test_definition @@ -114,13 +106,9 @@ test:go1.11-git-2.18-ruby-2.5: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 <<: *test_definition -test:go1.10-git2.18-ruby-2.5: - <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 - test:proxy: <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 script: - make test-with-proxies @@ -33,7 +33,7 @@ removed](https://about.gitlab.com/2018/09/12/the-road-to-gitaly-1-0/). For performance reasons some RPCs can be performed through NFS still. An effort is made to mitigate performance issues by removing [Gitaly N+1](https://gitlab.com/groups/gitlab-org/-/epics/827). -Once that is no longer neccesairy we can conclude the migration project by +Once that is no longer neccesairy we can conclude the migration project by [removing the Git repository storage paths from gitlab-rails's configuration](https://gitlab.com/gitlab-org/gitaly/issues/1282). @@ -55,7 +55,7 @@ GitLab.com, we have [dashboards][dashboards]! 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.10 or newer and Ruby 2.5. Run `make` to download +Gitaly requires Go 1.11 or newer and Ruby 2.5. Run `make` to download and compile Ruby dependencies, and to compile the Gitaly Go executable. diff --git a/changelogs/unreleased/zj-drop-go-1-10.yml b/changelogs/unreleased/zj-drop-go-1-10.yml new file mode 100644 index 000000000..73af36673 --- /dev/null +++ b/changelogs/unreleased/zj-drop-go-1-10.yml @@ -0,0 +1,5 @@ +--- +title: Drop support for Golang 1.10 +merge_request: 1149 +author: +type: removed |