Skip to content

Commit bfe568d

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #6060 from Luap99/go-1.23
Update to Go 1.23 and bump golang.org/x/crypto v0.36.0
2 parents 1f44a97 + 8e9e02c commit bfe568d

File tree

11 files changed

+79
-71
lines changed

11 files changed

+79
-71
lines changed

‎.cirrus.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ vendor_task:
122122

123123
# Runs within Cirrus's "community cluster"
124124
container:
125-
image: docker.io/library/golang:1.22
125+
image: docker.io/library/golang:1.23
126126
cpu: 1
127127
memory: 1
128128

@@ -207,7 +207,7 @@ integration_task:
207207
DISTRO_NV: "${FEDORA_NAME}"
208208
IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
209209
STORAGE_DRIVER: 'vfs'
210-
# Disabled until we update to f40/41 as f39 does not have go 1.22
210+
# Disabled until we update to f41/42 as f40 does not have go 1.22
211211
# - env:
212212
# DISTRO_NV: "${PRIOR_FEDORA_NAME}"
213213
# IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"
@@ -221,7 +221,7 @@ integration_task:
221221
DISTRO_NV: "${FEDORA_NAME}"
222222
IMAGE_NAME: "${FEDORA_CACHE_IMAGE_NAME}"
223223
STORAGE_DRIVER: 'overlay'
224-
# Disabled until we update to f40/41 as f39 does not have go 1.22
224+
# Disabled until we update to f41/42 as f40 does not have go 1.22
225225
# - env:
226226
# DISTRO_NV: "${PRIOR_FEDORA_NAME}"
227227
# IMAGE_NAME: "${PRIOR_FEDORA_CACHE_IMAGE_NAME}"

‎.packit.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@ jobs:
4747
failure_comment:
4848
message: "Ephemeral COPR build failed. @containers/packit-build please check."
4949
targets: &fedora_copr_targets
50-
- fedora-all-x86_64
51-
- fedora-all-aarch64
50+
# f40 ships go 1.22 and we require go 1.23 now. This should be revert to fedora-all
51+
# once either f40 is rebased to go 1.23 or f42 is released and f40 EOL.
52+
- fedora-latest-stable-x86_64
53+
- fedora-latest-stable-aarch64
54+
- fedora-development-x86_64
55+
- fedora-development-aarch64
5256
enable_net: true
5357

5458
- job: copr_build
@@ -92,7 +96,9 @@ jobs:
9296
trigger: pull_request
9397
packages: [buildah-fedora]
9498
targets: &fedora_copr_test_targets
95-
- fedora-all-x86_64
99+
# See the other comment above, this should be reverted to fedora-all when possible.
100+
- fedora-latest-stable-x86_64
101+
- fedora-development-x86_64
96102
tf_extra_params:
97103
environments:
98104
- artifacts:

‎go.mod

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/containers/buildah
22

33
// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
44

5-
go 1.22.8
5+
go 1.23.0
66

77
require (
88
github.com/containerd/platforms v1.0.0-rc.1
@@ -36,10 +36,10 @@ require (
3636
github.com/spf13/pflag v1.0.6
3737
github.com/stretchr/testify v1.10.0
3838
go.etcd.io/bbolt v1.3.11
39-
golang.org/x/crypto v0.33.0
40-
golang.org/x/sync v0.11.0
41-
golang.org/x/sys v0.30.0
42-
golang.org/x/term v0.29.0
39+
golang.org/x/crypto v0.36.0
40+
golang.org/x/sync v0.12.0
41+
golang.org/x/sys v0.31.0
42+
golang.org/x/term v0.30.0
4343
sigs.k8s.io/yaml v1.4.0
4444
tags.cncf.io/container-device-interface v0.8.1
4545
)
@@ -147,7 +147,7 @@ require (
147147
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 // indirect
148148
golang.org/x/mod v0.22.0 // indirect
149149
golang.org/x/net v0.34.0 // indirect
150-
golang.org/x/text v0.22.0 // indirect
150+
golang.org/x/text v0.23.0 // indirect
151151
google.golang.org/genproto/googleapis/rpc v0.0.0-20250102185135-69823020774d // indirect
152152
google.golang.org/grpc v1.69.4 // indirect
153153
google.golang.org/protobuf v1.36.2 // indirect

‎go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,8 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
403403
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
404404
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
405405
golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
406-
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
407-
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
406+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
407+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
408408
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
409409
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329 h1:9kj3STMvgqy3YA4VQXBrN7925ICMxD5wzMRcgA30588=
410410
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
@@ -450,8 +450,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
450450
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
451451
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
452452
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
453-
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
454-
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
453+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
454+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
455455
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
456456
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
457457
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -472,8 +472,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
472472
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
473473
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
474474
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
475-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
476-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
475+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
476+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
477477
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
478478
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
479479
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -483,8 +483,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
483483
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
484484
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
485485
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
486-
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
487-
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
486+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
487+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
488488
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
489489
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
490490
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -494,8 +494,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
494494
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
495495
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
496496
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
497-
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
498-
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
497+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
498+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
499499
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
500500
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
501501
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎vendor/golang.org/x/crypto/ssh/handshake.go

+37-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/crypto/ssh/messages.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/crypto/ssh/tcpip.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/sync/errgroup/errgroup.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/sync/errgroup/go120.go

-13
This file was deleted.

‎vendor/golang.org/x/sync/errgroup/pre_go120.go

-14
This file was deleted.

‎vendor/modules.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,8 @@ go.opentelemetry.io/otel/metric/noop
735735
## explicit; go 1.22
736736
go.opentelemetry.io/otel/trace
737737
go.opentelemetry.io/otel/trace/embedded
738-
# golang.org/x/crypto v0.33.0
739-
## explicit; go 1.20
738+
# golang.org/x/crypto v0.36.0
739+
## explicit; go 1.23.0
740740
golang.org/x/crypto/argon2
741741
golang.org/x/crypto/bcrypt
742742
golang.org/x/crypto/blake2b
@@ -780,22 +780,22 @@ golang.org/x/net/http2/hpack
780780
golang.org/x/net/idna
781781
golang.org/x/net/internal/timeseries
782782
golang.org/x/net/trace
783-
# golang.org/x/sync v0.11.0
784-
## explicit; go 1.18
783+
# golang.org/x/sync v0.12.0
784+
## explicit; go 1.23.0
785785
golang.org/x/sync/errgroup
786786
golang.org/x/sync/semaphore
787-
# golang.org/x/sys v0.30.0
788-
## explicit; go 1.18
787+
# golang.org/x/sys v0.31.0
788+
## explicit; go 1.23.0
789789
golang.org/x/sys/cpu
790790
golang.org/x/sys/plan9
791791
golang.org/x/sys/unix
792792
golang.org/x/sys/windows
793793
golang.org/x/sys/windows/registry
794-
# golang.org/x/term v0.29.0
795-
## explicit; go 1.18
794+
# golang.org/x/term v0.30.0
795+
## explicit; go 1.23.0
796796
golang.org/x/term
797-
# golang.org/x/text v0.22.0
798-
## explicit; go 1.18
797+
# golang.org/x/text v0.23.0
798+
## explicit; go 1.23.0
799799
golang.org/x/text/secure/bidirule
800800
golang.org/x/text/transform
801801
golang.org/x/text/unicode/bidi

0 commit comments

Comments
 (0)