diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-05-09 17:40:34 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-05-09 17:40:34 +0300 |
| commit | 0f78049299b1e547286e51c61da869812e5e348c (patch) | |
| tree | ac7ba1b79e6bce2e23f529e3f82a6c944c544d00 | |
| parent | 8391d76e1e0731e6f5270f1a73d4a8aa05cb92e8 (diff) | |
| parent | c0b1e79304f2ab9c1f4676db8ccaa2fcaaf7b866 (diff) | |
Merge branch 'zj-drop-golang-1.8' into 'master'
Drop support for Golang 1.8
See merge request gitlab-org/gitaly!715
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | CHANGELOG.md | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8397d9d5f..4cace9bf2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,10 +81,6 @@ build:go1.9: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16 -build:go1.8: - <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8.6-git-2.14 - binaries_go1.10: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16 @@ -93,17 +89,9 @@ binaries_go1.9: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16 -binaries_go1.8: - <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8.6-git-2.14 - test:default: <<: *test_definition -test:go1.8-git2.14: - <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8-git-2.14 - test:go1.9-git2.9: <<: *test_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.9 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a730662e..edf731a47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ UNRELEASED https://gitlab.com/gitlab-org/gitaly/merge_requests/711 - Remove ruby concurrency limiter https://gitlab.com/gitlab-org/gitaly/merge_requests/708 +- Drop support for Golang 1.8 + https://gitlab.com/gitlab-org/gitaly/merge_requests/715 - Introduce src-d/go-git as dependency https://gitlab.com/gitlab-org/gitaly/merge_requests/709 |