diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-08-28 11:15:03 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-08-28 11:15:03 +0300 |
| commit | 6272bb4a00d1d389fa7869b48c4fab756a7f6b32 (patch) | |
| tree | 2e1734441d079f2b98f231572dab3cf01a9646cf | |
| parent | c9ac6939d92b6f7e9d89f10eae1ca68c42cde51f (diff) | |
Add Golang 1.11 to the test matrix
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | internal/service/repository/size.go | 3 | ||||
| -rw-r--r-- | internal/testhelper/testhelper.go | 2 |
3 files changed, 20 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a92952f77..21496d3f3 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.9-git-2.18 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 stages: - build @@ -75,6 +75,10 @@ danger-review: - git version - make test +build:go1.11: + <<: *build_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.11-git-2.18 + build:go1.10: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 @@ -83,6 +87,10 @@ 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 + binaries_go1.10: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 @@ -91,6 +99,10 @@ 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 @@ -106,6 +118,10 @@ 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/internal/service/repository/size.go b/internal/service/repository/size.go index 6d6955bd0..d9605ea30 100644 --- a/internal/service/repository/size.go +++ b/internal/service/repository/size.go @@ -2,6 +2,7 @@ package repository import ( "bytes" + "fmt" "io/ioutil" "os/exec" "strconv" @@ -40,7 +41,7 @@ func (s *server) RepositorySize(ctx context.Context, in *pb.RepositorySizeReques sizeParts := bytes.Split(sizeLine, []byte("\t")) if len(sizeParts) != 2 { - grpc_logrus.Extract(ctx).Warn("ignoring du malformed output: %q", sizeLine) + grpc_logrus.Extract(ctx).Warn(fmt.Sprintf("ignoring du malformed output: %q", sizeLine)) return repositorySizeResponse(0), nil } diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 071c07dbd..17be64667 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -252,7 +252,7 @@ func ConfigureRuby() { } if err := config.ConfigureRuby(); err != nil { - log.Fatal("validate ruby config: %v", err) + log.Fatalf("validate ruby config: %v", err) } } |