diff options
-rw-r--r-- | .gitlab-ci.yml | 28 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | _support/instrumented-cluster/docker-compose.yml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/drop-go-1-9.yml | 5 | ||||
-rw-r--r-- | internal/service/blob/get_blob_test.go | 4 | ||||
-rw-r--r-- | internal/service/diff/commit_test.go | 2 | ||||
-rw-r--r-- | internal/service/smarthttp/receive_pack_test.go | 4 |
7 files changed, 14 insertions, 33 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: diff --git a/Dockerfile b/Dockerfile index f10615d42..8e4be4d88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,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-4-golang-1.9-git-2.17 +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2-4-golang-1.11-git-2.17 RUN mkdir -p /app/ruby diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml index bb5a20396..5ea115dfa 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.4-golang-1.9-git-2.17 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.17 volumes: - gitalydata1:/repositories - ./gitaly1repos/setup.sh:/setup.sh diff --git a/changelogs/unreleased/drop-go-1-9.yml b/changelogs/unreleased/drop-go-1-9.yml new file mode 100644 index 000000000..dba971727 --- /dev/null +++ b/changelogs/unreleased/drop-go-1-9.yml @@ -0,0 +1,5 @@ +--- +title: Remove support for Go 1.9 +merge_request: +author: +type: deprecated diff --git a/internal/service/blob/get_blob_test.go b/internal/service/blob/get_blob_test.go index a0ea07303..bcccb1855 100644 --- a/internal/service/blob/get_blob_test.go +++ b/internal/service/blob/get_blob_test.go @@ -159,8 +159,8 @@ func TestFailedGetBlobRequestDueToValidationError(t *testing.T) { rpcRequests := []pb.GetBlobRequest{ {Repository: &pb.Repository{StorageName: "fake", RelativePath: "path"}, Oid: oid}, // Repository doesn't exist - {Repository: nil, Oid: oid}, // Repository is nil - {Repository: testRepo}, // Oid is empty + {Repository: nil, Oid: oid}, // Repository is nil + {Repository: testRepo}, // Oid is empty } for _, rpcRequest := range rpcRequests { diff --git a/internal/service/diff/commit_test.go b/internal/service/diff/commit_test.go index bc176951e..13ac79ffe 100644 --- a/internal/service/diff/commit_test.go +++ b/internal/service/diff/commit_test.go @@ -407,7 +407,7 @@ func TestSuccessfulCommitDiffRequestWithIgnoreWhitespaceChange(t *testing.T) { RightCommitId: rightCommit, LeftCommitId: leftCommit, IgnoreWhitespaceChange: true, - Paths: entry.paths, + Paths: entry.paths, } ctx, cancel := context.WithCancel(context.Background()) diff --git a/internal/service/smarthttp/receive_pack_test.go b/internal/service/smarthttp/receive_pack_test.go index 6aeb6ae12..91b8799ac 100644 --- a/internal/service/smarthttp/receive_pack_test.go +++ b/internal/service/smarthttp/receive_pack_test.go @@ -194,8 +194,8 @@ func TestFailedReceivePackRequestDueToValidationError(t *testing.T) { defer conn.Close() rpcRequests := []pb.PostReceivePackRequest{ - {Repository: &pb.Repository{StorageName: "fake", RelativePath: "path"}, GlId: "user-123"}, // Repository doesn't exist - {Repository: nil, GlId: "user-123"}, // Repository is nil + {Repository: &pb.Repository{StorageName: "fake", RelativePath: "path"}, GlId: "user-123"}, // Repository doesn't exist + {Repository: nil, GlId: "user-123"}, // Repository is nil {Repository: &pb.Repository{StorageName: "default", RelativePath: "path/to/repo"}, GlId: ""}, // Empty GlId {Repository: &pb.Repository{StorageName: "default", RelativePath: "path/to/repo"}, GlId: "user-123", Data: []byte("Fail")}, // Data exists on first request } |