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:
authorSami Hiltunen <shiltunen@gitlab.com>2023-05-31 18:58:25 +0300
committerSami Hiltunen <shiltunen@gitlab.com>2023-05-31 18:58:25 +0300
commit9749fd48f67d093ce8e135fcd2a0b68295537a99 (patch)
tree3bb8d4d5e38f0cef64706983e4dd98ac2d5dc603
parentc3794da5ff0fe85a5055f41e63de6fa82da233b4 (diff)
parent300bb4f35cd8e28db08cc646079e013192200759 (diff)
Merge branch 'pks-go-v1.20' into 'master'
go: Use Go 1.19 as minimum required version Closes #5324 See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5831 Merged-by: Sami Hiltunen <shiltunen@gitlab.com> Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Reviewed-by: Patrick Steinhardt <psteinhardt@gitlab.com> Reviewed-by: Quang-Minh Nguyen <qmnguyen@gitlab.com> Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Diffstat
-rw-r--r--.gitlab-ci.yml10
-rw-r--r--.tool-versions2
-rw-r--r--Makefile3
-rw-r--r--README.md2
-rw-r--r--go.mod2
-rw-r--r--internal/gitaly/transaction_manager.go14
-rw-r--r--internal/gitaly/transaction_manager_test.go12
-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/gofumpt/go.sum40
-rw-r--r--tools/goimports/go.mod4
-rw-r--r--tools/goimports/go.sum41
-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
-rw-r--r--tools/protolint/go.sum4
21 files changed, 35 insertions, 119 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f2878023..91a8cdd00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
CACHE_PREFIX: "debian-${DEBIAN_VERSION}"
# We use Gitaly's Git version by default.
GIT_VERSION: "default"
- GO_VERSION: "1.19"
+ GO_VERSION: "1.20"
RUBY_VERSION: "3.1"
RUST_VERSION: "1.65"
POSTGRES_VERSION: "12-alpine"
@@ -178,7 +178,7 @@ build:
- go run ./tools/test-boot ${TEST_BOOT_ARGS}
parallel:
matrix:
- - GO_VERSION: [ "1.18", "1.19" ]
+ - GO_VERSION: [ "1.19", "1.20" ]
TEST_BOOT_ARGS: "--bundled-git"
- GIT_VERSION: "v2.40.0"
@@ -203,7 +203,7 @@ build:binaries:
expire_in: 6 months
parallel:
matrix:
- - GO_VERSION: [ "1.18", "1.19" ]
+ - GO_VERSION: [ "1.19", "1.20" ]
test:
<<: *test_definition
@@ -211,7 +211,7 @@ test:
matrix:
# The following jobs all test with our default Git version, which is
# using bundled Git binaries.
- - GO_VERSION: [ "1.18", "1.19" ]
+ - GO_VERSION: [ "1.19", "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
@@ -311,7 +311,7 @@ test:fips:
matrix:
- TEST_TARGET: [ test, test-with-praefect ]
FIPS_MODE: "YesPlease"
- GO_VERSION: ["1.18", "1.19"]
+ GO_VERSION: ["1.19"]
rules:
# Automatically run the job when the FIPS label is set.
- if: $CI_MERGE_REQUEST_LABELS =~ /FIPS/
diff --git a/.tool-versions b/.tool-versions
index d61f5b460..5e81ae83c 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,4 +1,4 @@
# Versions of Gitaly dependencies managed by asdf.
-golang 1.19.9 1.18.9
+golang 1.20.4 1.19.9
golangci-lint 1.50.1
ruby 3.1.4
diff --git a/Makefile b/Makefile
index 20a0ffa79..8d13402f5 100644
--- a/Makefile
+++ b/Makefile
@@ -449,8 +449,7 @@ lint-docs:
## Test Go tests in tools/golangci-lint/gitaly folder
## That folder has its own go.mod file. Hence linter must run the context of that folder.
lint-gitaly-linters: ${GOLANGCI_LINT} ${TOOLS_DIR}/gitaly-linters.so
- ${Q}cd ${SOURCE_DIR}/tools/golangci-lint/gitaly
- ${Q}${GOLANGCI_LINT} run --out-format tab --config ${GOLANGCI_LINT_CONFIG} .
+ ${Q}cd ${SOURCE_DIR}/tools/golangci-lint/gitaly && ${GOLANGCI_LINT} run --out-format tab --config ${GOLANGCI_LINT_CONFIG} .
.PHONY: format
## Run Go formatter and adjust imports.
diff --git a/README.md b/README.md
index 5bb1e84a4..7e0c77962 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ GitLab.com, read about our [observability story](doc/observability.md)!
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.18 or Go 1.19.7. Run `make` to compile the executables
+Gitaly requires Go 1.19 or Go 1.20. Run `make` to compile the executables
required by Gitaly.
Gitaly uses `git`. Versions `2.40.0` and newer are supported.
diff --git a/go.mod b/go.mod
index 519cc9bb5..11eee3877 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitaly/v16
-go 1.18
+go 1.19
// 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/gitaly/transaction_manager.go b/internal/gitaly/transaction_manager.go
index fd1b71284..ab493dd34 100644
--- a/internal/gitaly/transaction_manager.go
+++ b/internal/gitaly/transaction_manager.go
@@ -131,12 +131,12 @@ type Transaction struct {
// result is where the outcome of the transaction is sent ot by TransactionManager once it
// has been determined.
result chan error
- // admitted denotes whether the transaction was admitted for processing in the TransactionManager.
+ // admitted is closed when the transaction was admitted for processing in the TransactionManager.
// Transaction queues in admissionQueue to be committed, and is considered admitted once it has
// been dequeued by TransactionManager.Run(). Once the transaction is admitted, its ownership moves
// from the client goroutine to the TransactionManager.Run() goroutine, and the client goroutine must
// not do any modifications to the state of the transcation anymore to avoid races.
- admitted bool
+ admitted chan struct{}
// finish cleans up the transaction releasing the resources associated with it. It must be called
// once the transaction is done with.
finish func() error
@@ -197,6 +197,7 @@ func (mgr *TransactionManager) Begin(ctx context.Context) (_ *Transaction, retur
CustomHookIndex: mgr.customHookIndex,
CustomHookPath: customHookPathForLogIndex(mgr.repositoryPath, mgr.customHookIndex),
},
+ admitted: make(chan struct{}),
finished: make(chan struct{}),
}
@@ -290,11 +291,12 @@ func (txn *Transaction) Rollback() error {
// the Transaction is being processed by TransactionManager. The clean up responsibility moves there as well
// to avoid races.
func (txn *Transaction) finishUnadmitted() error {
- if txn.admitted {
+ select {
+ case <-txn.admitted:
return nil
+ default:
+ return txn.finish()
}
-
- return txn.finish()
}
// Snapshot returns the details of the Transaction's read snapshot.
@@ -524,7 +526,7 @@ func (mgr *TransactionManager) commit(ctx context.Context, transaction *Transact
select {
case mgr.admissionQueue <- transaction:
- transaction.admitted = true
+ close(transaction.admitted)
select {
case err := <-transaction.result:
diff --git a/internal/gitaly/transaction_manager_test.go b/internal/gitaly/transaction_manager_test.go
index 47028edfc..dd3e6059f 100644
--- a/internal/gitaly/transaction_manager_test.go
+++ b/internal/gitaly/transaction_manager_test.go
@@ -3093,17 +3093,9 @@ func TestTransactionManager(t *testing.T) {
// The transactions generally don't block each other due to MVCC. Repository deletions are not yet managed via MVCC
// and thus block until all other transactions with an older snapshot are finished. In order to test transactions with
// concurrent repository deletions, we have to commit the deletions asynchronously. We peek here at the internals to
- // determine that the deletion has actually committed, and is waiting for application to ensure the commit order is always
+ // determine that the deletion has actually been admitted, and is waiting for application to ensure the commit order is always
// as expected by the test.
- <-transactionManager.initialized
- for {
- transactionManager.mutex.Lock()
- if transactionManager.appliedLogIndex < transactionManager.appendedLogIndex {
- transactionManager.mutex.Unlock()
- break
- }
- transactionManager.mutex.Unlock()
- }
+ <-transaction.admitted
case Rollback:
require.Contains(t, openTransactions, step.TransactionID, "test error: transaction rollbacked before beginning it")
require.NoError(t, openTransactions[step.TransactionID].Rollback())
diff --git a/tools/dlv/go.mod b/tools/dlv/go.mod
index 8c5bed8f1..b7b5795f5 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.17
+go 1.19
require github.com/go-delve/delve v1.20.2
diff --git a/tools/go-licenses/go.mod b/tools/go-licenses/go.mod
index 95c57c745..0b1e7d220 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.17
+go 1.19
require github.com/google/go-licenses v1.6.0
diff --git a/tools/gocover-cobertura/go.mod b/tools/gocover-cobertura/go.mod
index e7ed49a7e..143049cef 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.17
+go 1.19
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 8be6f3d3c..a13c8fbb7 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.17
+go 1.19
require mvdan.cc/gofumpt v0.5.0
diff --git a/tools/gofumpt/go.sum b/tools/gofumpt/go.sum
index ba1b75f1e..fdcf236f5 100644
--- a/tools/gofumpt/go.sum
+++ b/tools/gofumpt/go.sum
@@ -1,55 +1,15 @@
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
-github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E=
mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js=
diff --git a/tools/goimports/go.mod b/tools/goimports/go.mod
index 66dbec877..ae7ae49e8 100644
--- a/tools/goimports/go.mod
+++ b/tools/goimports/go.mod
@@ -1,10 +1,10 @@
module gitlab.com/gitlab-org/gitaly/tools/goimports
-go 1.17
+go 1.19
require golang.org/x/tools v0.9.1
require (
golang.org/x/mod v0.10.0 // indirect
- golang.org/x/sys v0.7.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
)
diff --git a/tools/goimports/go.sum b/tools/goimports/go.sum
index 4604d7843..7995eec85 100644
--- a/tools/goimports/go.sum
+++ b/tools/goimports/go.sum
@@ -1,39 +1,6 @@
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
diff --git a/tools/golangci-lint/go.mod b/tools/golangci-lint/go.mod
index 611f278bc..adc35efc7 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.18
+go 1.19
require github.com/golangci/golangci-lint v1.52.2
diff --git a/tools/gotestsum/go.mod b/tools/gotestsum/go.mod
index 6d9e0d29e..33c8d3923 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.17
+go 1.19
require gotest.tools/gotestsum v1.10.0
diff --git a/tools/protoc-gen-doc/go.mod b/tools/protoc-gen-doc/go.mod
index d44fff918..bcb7f07f4 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.17
+go 1.19
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 39fe70305..aa8c1223b 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.17
+go 1.19
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 e1a50e17e..bddadb05e 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.17
+go 1.19
require google.golang.org/protobuf v1.30.0
diff --git a/tools/protolint/go.mod b/tools/protolint/go.mod
index 33b60789d..d2e9ffea7 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.17
+go 1.19
require github.com/yoheimuta/protolint v0.43.2
diff --git a/tools/protolint/go.sum b/tools/protolint/go.sum
index c31709504..913f2e9ab 100644
--- a/tools/protolint/go.sum
+++ b/tools/protolint/go.sum
@@ -86,7 +86,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA
github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -142,14 +141,11 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 h1:ohgcoMbSofXygzo6AD2I1kz3BFmW1QArPYTtwEM3UXc=
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 11:04:36 +0300