Skip to content

Commit 4b6247d

Browse files
matzewmatejvasek
matzew
and
matejvasek
authored
[release-1.12] Bump for GO-GIT 5.11 (#2133)
* 💫 Bump for GO-GIT 5.11 Signed-off-by: Matthias Wessendorf <[email protected]> * chore: update Go lint Signed-off-by: Matej Vasek <[email protected]> * fix: GitLab test Update to URL used in newer versions of GitLab. Signed-off-by: Matej Vasek <[email protected]> * fixup: increase resource limit Signed-off-by: Matej Vasek <[email protected]> --------- Signed-off-by: Matthias Wessendorf <[email protected]> Signed-off-by: Matej Vasek <[email protected]> Co-authored-by: Matej Vasek <[email protected]>
1 parent cd0bc6a commit 4b6247d

File tree

8 files changed

+102
-43
lines changed

8 files changed

+102
-43
lines changed

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ check: $(BIN_GOLANGCI_LINT) ## Check code quality (lint)
7373
cd test && $(BIN_GOLANGCI_LINT) run --timeout 300s
7474

7575
$(BIN_GOLANGCI_LINT):
76-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.53.2
76+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b ./bin v1.55.2
7777

7878
.PHONY: generate/zz_filesystem_generated.go
7979
generate/zz_filesystem_generated.go: clean_templates templates/certs/ca-certificates.crt

Diff for: ‎go.mod

+11-10
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ require (
2121
github.com/docker/docker v24.0.5-0.20230718221249-d4a26c153000+incompatible
2222
github.com/docker/docker-credential-helpers v0.7.0
2323
github.com/docker/go-connections v0.4.0
24-
github.com/go-git/go-billy/v5 v5.4.1
25-
github.com/go-git/go-git/v5 v5.7.0
24+
github.com/go-git/go-billy/v5 v5.5.0
25+
github.com/go-git/go-git/v5 v5.11.0
2626
github.com/google/go-cmp v0.6.0
2727
github.com/google/go-containerregistry v0.15.2
2828
github.com/google/go-github/v49 v49.1.0
@@ -45,11 +45,11 @@ require (
4545
github.com/tektoncd/pipeline v0.47.0
4646
github.com/whilp/git-urls v1.0.0
4747
github.com/xanzy/go-gitlab v0.83.0
48-
golang.org/x/crypto v0.14.0
49-
golang.org/x/net v0.17.0
48+
golang.org/x/crypto v0.16.0
49+
golang.org/x/net v0.19.0
5050
golang.org/x/oauth2 v0.13.0
5151
golang.org/x/sync v0.4.0
52-
golang.org/x/term v0.13.0
52+
golang.org/x/term v0.15.0
5353
gopkg.in/yaml.v2 v2.4.0
5454
gopkg.in/yaml.v3 v3.0.1
5555
gotest.tools/v3 v3.4.0
@@ -66,6 +66,7 @@ require (
6666
require (
6767
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
6868
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
69+
dario.cat/mergo v1.0.0 // indirect
6970
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
7071
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7172
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -78,8 +79,7 @@ require (
7879
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
7980
github.com/BurntSushi/toml v1.3.2 // indirect
8081
github.com/OneOfOne/xxhash v1.2.8 // indirect
81-
github.com/ProtonMail/go-crypto v0.0.0-20230518184743-7afd39499903 // indirect
82-
github.com/acomagu/bufpipe v1.0.4 // indirect
82+
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
8383
github.com/agext/levenshtein v1.2.3 // indirect
8484
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
8585
github.com/apex/log v1.9.0 // indirect
@@ -112,6 +112,7 @@ require (
112112
github.com/containerd/typeurl v1.0.2 // indirect
113113
github.com/containers/storage v1.48.0 // indirect
114114
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
115+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
115116
github.com/davecgh/go-spew v1.1.1 // indirect
116117
github.com/dgraph-io/ristretto v0.0.1 // indirect
117118
github.com/dimchansky/utfbom v1.1.1 // indirect
@@ -210,7 +211,7 @@ require (
210211
github.com/russross/blackfriday/v2 v2.1.0 // indirect
211212
github.com/sergi/go-diff v1.2.0 // indirect
212213
github.com/sirupsen/logrus v1.9.3 // indirect
213-
github.com/skeema/knownhosts v1.1.1 // indirect
214+
github.com/skeema/knownhosts v1.2.1 // indirect
214215
github.com/spf13/afero v1.9.5 // indirect
215216
github.com/spf13/cast v1.5.0 // indirect
216217
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -227,8 +228,8 @@ require (
227228
go.uber.org/zap v1.26.0 // indirect
228229
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
229230
golang.org/x/mod v0.13.0 // indirect
230-
golang.org/x/sys v0.13.0 // indirect
231-
golang.org/x/text v0.13.0 // indirect
231+
golang.org/x/sys v0.15.0 // indirect
232+
golang.org/x/text v0.14.0 // indirect
232233
golang.org/x/time v0.3.0 // indirect
233234
golang.org/x/tools v0.14.0 // indirect
234235
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect

Diff for: ‎go.sum

+30-28
Large diffs are not rendered by default.

Diff for: ‎hack/install-gitlab.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ spec:
8181
name: ssh
8282
resources:
8383
requests:
84-
memory: "1024Mi"
85-
limits:
8684
memory: "2048Mi"
85+
limits:
86+
memory: "4096Mi"
8787
volumes:
8888
- name: gitlab
8989
persistentVolumeClaim:

Diff for: ‎pkg/pipelines/tekton/gitlab_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ func getAPIToken(baseURL, username, password string) (string, error) {
410410
return "", fmt.Errorf("cannot sign in, unexpected status: %d", resp.StatusCode)
411411
}
412412

413-
personalAccessTokensURL := baseURL + "/-/profile/personal_access_tokens"
413+
personalAccessTokensURL := baseURL + "/-/user_settings/personal_access_tokens"
414414

415415
resp, err = c.Get(personalAccessTokensURL)
416416
if err != nil {

Diff for: ‎third_party/VENDOR-LICENSE/dario.cat/mergo/LICENSE

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright (c) 2013 Dario Castañé. All rights reserved.
2+
Copyright (c) 2012 The Go Authors. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above
11+
copyright notice, this list of conditions and the following disclaimer
12+
in the documentation and/or other materials provided with the
13+
distribution.
14+
* Neither the name of Google Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Diff for: ‎third_party/VENDOR-LICENSE/github.com/cyphar/filepath-securejoin/LICENSE

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Copyright (C) 2014-2015 Docker Inc & Go Authors. All rights reserved.
2+
Copyright (C) 2017 SUSE LLC. All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above
11+
copyright notice, this list of conditions and the following disclaimer
12+
in the documentation and/or other materials provided with the
13+
distribution.
14+
* Neither the name of Google Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Diff for: ‎third_party/VENDOR-LICENSE/github.com/skeema/knownhosts/NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2023 Skeema LLC and the Skeema authors
1+
Copyright 2023 Skeema LLC and the Skeema Knownhosts authors
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)