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.

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

[release/1.7] update to go 1.21.6, test 1.22.0 #9860

Merged
merged 7 commits into from
Mar 5, 2024

Conversation

akhilerm
Copy link
Member

@akhilerm akhilerm commented Feb 22, 2024

Cherry picks :

Notes for reviewers

  • The PR has lot of cherry pick commits because all the related commits to build / test and run the CI on go1.21.0 are currently dependent on the changes in the other cherry-picks. The only PR that could be cherry-picked independently was Extract setup-go step into composite action #9786, but that would again require changes as it was built on top of go1.21.x . Hence combining all the commits.

  • go version is kept at 1.21.6 since main is also on 1.21.6, and there is a security release on March 5 for 1.21.8. Hence the main, and release branches can be updated to 1.21.8 together.

  • Follow up cherry-pick of [CI] Move inline PS scripts into files #9777 will be done once this PR is merged.

@akhilerm akhilerm marked this pull request as draft February 22, 2024 18:21
@akhilerm akhilerm force-pushed the update-go-version-1.7 branch 2 times, most recently from 8179657 to 4b8b3e6 Compare February 29, 2024 16:37
@akhilerm akhilerm force-pushed the update-go-version-1.7 branch 3 times, most recently from 4ed8a6f to d93337a Compare March 1, 2024 11:28
mxpv added 3 commits March 1, 2024 19:53
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
(cherry picked from commit 488b563)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
(cherry picked from commit 2820343)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
(cherry picked from commit 360fbf1)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
kiashok and others added 4 commits March 4, 2024 18:13
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit 87aa9e8)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
Tests in pkg/cri/[sb]server/container_create_linux_test.go depends on go:noinline
since Go 1.21.

e.g.,
> ```
> === FAIL: pkg/cri/sbserver TestGenerateSeccompSecurityProfileSpecOpts/should_set_default_seccomp_when_seccomp_is_runtime/default (0.00s)
>     container_create_linux_test.go:1013:
>         	Error Trace:	/home/runner/work/containerd/containerd/pkg/cri/sbserver/container_create_linux_test.go:1013
>         	Error:      	Not equal:
>         	            	expected: 0x263d880
>         	            	actual  : 0x263cbc0
>         	Test:       	TestGenerateSeccompSecurityProfileSpecOpts/should_set_default_seccomp_when_seccomp_is_runtime/default
> ```

See comments in PR 8957.

Thanks to Wei Fu for analyzing this.

Co-authored-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 0f043ae)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
The default version of MinGW and GCC on the GitHub-hosted Windows 2019
runners compile fine but lead to linker errors during runtime.

Signed-off-by: Nashwan Azhari <nazhari@cloudbasesolutions.com>
(cherry picked from commit c883410)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
(cherry picked from commit 21640c5)
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
@akhilerm akhilerm changed the title [release/1.7] update to go 1.21.7, test 1.22.0 [release/1.7] update to go 1.21.6, test 1.22.0 Mar 4, 2024
@akhilerm akhilerm marked this pull request as ready for review March 4, 2024 13:20
@AkihiroSuda AkihiroSuda merged commit 92b1d4e into containerd:release/1.7 Mar 5, 2024
58 checks passed
@akhilerm akhilerm deleted the update-go-version-1.7 branch March 5, 2024 02:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants