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:
authorNao Hashizume <nhashizume@gitlab.com>2023-07-21 13:00:18 +0300
committerkarthik nayak <knayak@gitlab.com>2023-07-21 13:00:18 +0300
commit3e17a23cefdb490087fc5dccea23bcea2608452f (patch)
tree5d8c75df155f00eebdfd7120e83f44a73b15e08b
parent1b480b9e6a1922017ad2347b2f6fb807d988f2d9 (diff)
Use Golang 1.20 as minimum required version
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--.tool-versions2
-rw-r--r--README.md3
-rw-r--r--go.mod2
-rw-r--r--internal/streamcache/sendfile_test.go2
-rw-r--r--tools/dlv/go.mod2
-rw-r--r--tools/go-licenses/go.mod2
-rw-r--r--tools/gocover-cobertura/go.mod2
-rw-r--r--tools/gofumpt/go.mod2
-rw-r--r--tools/goimports/go.mod2
-rw-r--r--tools/golangci-lint/go.mod2
-rw-r--r--tools/gotestsum/go.mod2
-rw-r--r--tools/protoc-gen-doc/go.mod2
-rw-r--r--tools/protoc-gen-go-grpc/go.mod2
-rw-r--r--tools/protoc-gen-go/go.mod2
-rw-r--r--tools/protolint/go.mod2
16 files changed, 19 insertions, 18 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3bf8abc6..1bc122950 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -202,7 +202,7 @@ build:
- go run ./tools/test-boot ${TEST_BOOT_ARGS}
parallel:
matrix:
- - GO_VERSION: [ "1.19", "1.20" ]
+ - GO_VERSION: [ "1.20" ]
TEST_BOOT_ARGS: "--bundled-git"
- GIT_VERSION: "v2.41.0"
only:
@@ -229,7 +229,7 @@ build:binaries:
expire_in: 6 months
parallel:
matrix:
- - GO_VERSION: [ "1.19", "1.20" ]
+ - GO_VERSION: [ "1.20" ]
only:
<<: *only_code_changes
@@ -239,7 +239,7 @@ test:
matrix:
# The following jobs all test with our default Git version, which is
# using bundled Git binaries.
- - GO_VERSION: [ "1.19", "1.20" ]
+ - GO_VERSION: [ "1.20" ]
TEST_TARGET: test
- TEST_TARGET: [ test-with-praefect, race-go, test-wal, test-with-praefect-wal]
# We also verify that things work as expected with a non-bundled Git
diff --git a/.tool-versions b/.tool-versions
index e8e1f238b..247f0919f 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
# Versions of Gitaly dependencies managed by asdf.
-golang 1.20.5 1.19.9
+golang 1.20.6
ruby 3.1.4
diff --git a/README.md b/README.md
index 9ffa3ff71..80f0f72ff 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,8 @@ We are building features according to our [roadmap][roadmap].
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.19 or Go 1.20. Run `make` to compile the executables required by Gitaly.
+Gitaly requires Go 1.20. Run `make` to compile the executables
+required by Gitaly.
Gitaly uses `git`. Versions `2.41.0` and newer are supported.
diff --git a/go.mod b/go.mod
index 277f67346..0b7ae6c17 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/v16
-go 1.19
+go 1.20
// It is a temporary solution, please see https://gitlab.com/gitlab-org/gitaly/-/issues/4423 for details.
replace github.com/go-enry/go-license-detector/v4 => github.com/gl-gitaly/go-license-detector/v4 v4.0.0-20230524080836-4cc9a3796917
diff --git a/internal/streamcache/sendfile_test.go b/internal/streamcache/sendfile_test.go
index bdf24cd30..94b9d163a 100644
--- a/internal/streamcache/sendfile_test.go
+++ b/internal/streamcache/sendfile_test.go
@@ -4,8 +4,8 @@ package streamcache
import (
"bytes"
+ "crypto/rand"
"io"
- "math/rand"
"os"
"path/filepath"
"testing"
diff --git a/tools/dlv/go.mod b/tools/dlv/go.mod
index 86ddfa7bc..fb90725c2 100644
--- a/tools/dlv/go.mod
+++ b/tools/dlv/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/dlv
-go 1.19
+go 1.20
require github.com/go-delve/delve v1.21.0
diff --git a/tools/go-licenses/go.mod b/tools/go-licenses/go.mod
index 0b1e7d220..fc46e54b2 100644
--- a/tools/go-licenses/go.mod
+++ b/tools/go-licenses/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/go-licenses
-go 1.19
+go 1.20
require github.com/google/go-licenses v1.6.0
diff --git a/tools/gocover-cobertura/go.mod b/tools/gocover-cobertura/go.mod
index 143049cef..5244959f6 100644
--- a/tools/gocover-cobertura/go.mod
+++ b/tools/gocover-cobertura/go.mod
@@ -1,5 +1,5 @@
module gitlab.com/gitlab-org/gitaly/tools/gocover-cobertura
-go 1.19
+go 1.20
require github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c
diff --git a/tools/gofumpt/go.mod b/tools/gofumpt/go.mod
index a13c8fbb7..76856da3b 100644
--- a/tools/gofumpt/go.mod
+++ b/tools/gofumpt/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/gofumpt
-go 1.19
+go 1.20
require mvdan.cc/gofumpt v0.5.0
diff --git a/tools/goimports/go.mod b/tools/goimports/go.mod
index e22e51375..387a1351d 100644
--- a/tools/goimports/go.mod
+++ b/tools/goimports/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/goimports
-go 1.19
+go 1.20
require golang.org/x/tools v0.11.0
diff --git a/tools/golangci-lint/go.mod b/tools/golangci-lint/go.mod
index e658a1e52..21672aff9 100644
--- a/tools/golangci-lint/go.mod
+++ b/tools/golangci-lint/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/golangci-lint
-go 1.19
+go 1.20
require github.com/golangci/golangci-lint v1.53.3
diff --git a/tools/gotestsum/go.mod b/tools/gotestsum/go.mod
index 32d7f2a45..3576843e9 100644
--- a/tools/gotestsum/go.mod
+++ b/tools/gotestsum/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/gotestsum
-go 1.19
+go 1.20
require gotest.tools/gotestsum v1.10.1
diff --git a/tools/protoc-gen-doc/go.mod b/tools/protoc-gen-doc/go.mod
index bcb7f07f4..80c25593d 100644
--- a/tools/protoc-gen-doc/go.mod
+++ b/tools/protoc-gen-doc/go.mod
@@ -1,6 +1,6 @@
module proto_gen_doc
-go 1.19
+go 1.20
require github.com/pseudomuto/protoc-gen-doc v1.5.1
diff --git a/tools/protoc-gen-go-grpc/go.mod b/tools/protoc-gen-go-grpc/go.mod
index aa8c1223b..6b636e40e 100644
--- a/tools/protoc-gen-go-grpc/go.mod
+++ b/tools/protoc-gen-go-grpc/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/protoc-gen-go-grpc
-go 1.19
+go 1.20
require (
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
diff --git a/tools/protoc-gen-go/go.mod b/tools/protoc-gen-go/go.mod
index df4ffe3d9..8fed605a1 100644
--- a/tools/protoc-gen-go/go.mod
+++ b/tools/protoc-gen-go/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/protoc-gen-go
-go 1.19
+go 1.20
require google.golang.org/protobuf v1.31.0
diff --git a/tools/protolint/go.mod b/tools/protolint/go.mod
index b023be78a..04e2d68cf 100644
--- a/tools/protolint/go.mod
+++ b/tools/protolint/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/tools/protolint
-go 1.19
+go 1.20
require github.com/yoheimuta/protolint v0.45.0