Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 6.53.x] Bump go-git to latest version #32811

Closed
wants to merge 4 commits into from
+184 −185
Closed

[Backport 6.53.x] Bump go-git to latest version #32811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
948c920
[Backport 6.53.x] Bump go-git to latest version
chouetz Jan 7, 2025
f16bd0c
tentative cache re-computation
chouetz Jan 9, 2025
36b3335
try to run licenses on gitlab
chouetz Jan 9, 2025
afd1d52
force license
chouetz Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ version: 2
# and https://learnxinyminutes.com/docs/yaml/

experimental:
# For some reason filtering out notifications keeps being undocumented and
# marked as experimental but as of today, it's still working.
notify:
branches:
only:
Expand Down
1 change: 1 addition & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ stages:
- maintenance_jobs
- deps_build
- deps_fetch
- lint
- source_test
- source_test_stats
- software_composition_analysis
Expand Down
11 changes: 11 additions & 0 deletions .gitlab/lint/technical_linters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
.lint:
stage: lint
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
Expand All @@ -8,3 +9,13 @@ validate_modules:
needs: []
script:
- inv -e modules.validate

lint_licenses:
extends: .lint
script:
- !reference [.retrieve_linux_go_deps]
- !reference [.retrieve_linux_go_tools_deps]
- inv -e install-tools
- inv -e lint-licenses
needs: ["go_tools_deps", "go_deps"]

61 changes: 31 additions & 30 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ core,github.com/sijms/go-ora/v2/network/security,MIT,Copyright (c) 2020 Samy Sul
core,github.com/sijms/go-ora/v2/network/security/md4,MIT,Copyright (c) 2020 Samy Sultan
core,github.com/sijms/go-ora/v2/trace,MIT,Copyright (c) 2020 Samy Sultan
core,github.com/sirupsen/logrus,MIT,Copyright (c) 2014 Simon Eskildsen
core,github.com/skeema/knownhosts,Apache-2.0,Copyright 2023 Skeema LLC and the Skeema Knownhosts authors | copyright 2023 Skeema LLC and the Skeema Knownhosts authors**
core,github.com/skeema/knownhosts,Apache-2.0,Copyright 2024 Skeema LLC and the Skeema Knownhosts authors | copyright 2024 Skeema LLC and the Skeema Knownhosts authors**
core,github.com/skydive-project/go-debouncer,Apache-2.0,"Copyright (C) 2018 Red Hat, Inc."
core,github.com/smira/go-ftp-protocol/protocol,MIT,Copyright (c) 2014 Andrey Smirnov
core,github.com/smira/go-xz,MIT,Copyright (c) 2015 Andrey Smirnov
Expand Down Expand Up @@ -1525,6 +1525,7 @@ core,github.com/stormcat24/protodep/pkg/logger,Apache-2.0,Copyright Akinori Yama
core,github.com/streadway/amqp,BSD-2-Clause,"Copyright (c) 2012-2019, Sean Treadway, SoundCloud Ltd"
core,github.com/stretchr/objx,MIT,"Copyright (c) 2014 Stretchr, Inc | Copyright (c) 2017-2018 objx contributors"
core,github.com/stretchr/testify/assert,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/assert/yaml,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/mock,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/require,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/suite,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
Expand Down Expand Up @@ -1962,37 +1963,37 @@ core,golang.org/x/crypto/ssh,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/crypto/ssh/agent,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/crypto/ssh/internal/bcrypt_pbkdf,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/crypto/ssh/knownhosts,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/constraints,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/maps,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/mmap,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slices,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slog,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slog/internal,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slog/internal/buffer,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/typeparams,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/constraints,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/maps,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/mmap,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slices,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slog,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slog/internal,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slog/internal/buffer,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/typeparams,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved | Copyright 2009 The Go Authors
core,golang.org/x/lint,BSD-3-Clause,Copyright (c) 2013 The Go Authors. All rights reserved
core,golang.org/x/lint/golint,BSD-3-Clause,Copyright (c) 2013 The Go Authors. All rights reserved
core,golang.org/x/net/bpf,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/context,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/html,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/html/atom,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/html/charset,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http/httpguts,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http/httpproxy,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http2,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http2/h2c,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http2/hpack,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/icmp,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/idna,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/iana,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/socket,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/socks,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/timeseries,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/ipv4,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/ipv6,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/proxy,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/trace,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/websocket,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/bpf,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/context,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/html,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/html/atom,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/html/charset,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http/httpguts,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http/httpproxy,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http2,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http2/h2c,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http2/hpack,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/icmp,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/idna,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/iana,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/socket,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/socks,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/timeseries,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/ipv4,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/ipv6,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/proxy,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/trace,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/websocket,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/oauth2,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/oauth2/authhandler,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/oauth2/clientcredentials,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
Expand Down
22 changes: 11 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ require (
github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd v22.5.0+incompatible
github.com/cri-o/ocicni v0.4.0
github.com/cyphar/filepath-securejoin v0.2.4
github.com/cyphar/filepath-securejoin v0.2.5
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/docker/docker v25.0.5+incompatible
github.com/docker/go-connections v0.5.0
Expand Down Expand Up @@ -234,7 +234,7 @@ require (
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/streadway/amqp v1.1.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
github.com/tinylib/msgp v1.1.8
github.com/twmb/murmur3 v1.1.8
Expand Down Expand Up @@ -269,13 +269,13 @@ require (
go.uber.org/zap v1.27.0
go4.org/netipx v0.0.0-20220812043211-3cc044ffd68d
golang.org/x/arch v0.7.0
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
golang.org/x/net v0.25.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/net v0.33.0
golang.org/x/sync v0.10.0
golang.org/x/sys v0.28.0
golang.org/x/text v0.21.0
golang.org/x/time v0.5.0
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
golang.org/x/tools v0.23.0
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/grpc v1.62.1
Expand Down Expand Up @@ -334,7 +334,7 @@ require (
github.com/Masterminds/semver v1.5.0
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/OneOfOne/xxhash v1.2.8 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.0
github.com/ProtonMail/go-crypto v1.1.3
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/agnivade/levenshtein v1.1.1 // indirect
Expand Down Expand Up @@ -386,8 +386,8 @@ require (
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/ghodss/yaml v1.0.0
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-git/go-billy/v5 v5.6.0 // indirect
github.com/go-git/go-git/v5 v5.13.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.4.1 // indirect
Expand Down Expand Up @@ -502,7 +502,7 @@ require (
github.com/saracen/walker v0.1.3 // indirect
github.com/sassoftware/go-rpmutils v0.3.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/shibumi/go-pathspec v1.3.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/smira/go-ftp-protocol v0.0.0-20140829150050-066b75c2b70d // indirect
Expand Down Expand Up @@ -560,7 +560,7 @@ require (
go.opentelemetry.io/otel/trace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/crypto v0.31.0 // indirect
golang.org/x/mod v0.17.0
golang.org/x/mod v0.19.0
golang.org/x/oauth2 v0.18.0 // indirect
golang.org/x/term v0.27.0 // indirect
gonum.org/v1/gonum v0.14.0 // indirect
Expand Down Expand Up @@ -742,7 +742,7 @@ require (
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sigstore/rekor v1.2.2 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/viper v1.18.2 // indirect
Expand Down
Loading
Loading