Skip to content

Cleanup build constraints#7776

Merged
mxpv merged 2 commits intocontainerd:mainfrom
mxpv:build
Dec 8, 2022
Merged

Cleanup build constraints#7776
mxpv merged 2 commits intocontainerd:mainfrom
mxpv:build

Conversation

@mxpv
Copy link
Copy Markdown
Member

@mxpv mxpv commented Dec 7, 2022

  1. We no longer need to maintain two versions of build constraints:

Go versions 1.16 and earlier used a different syntax for build constraints, with a "// +build" prefix. The gofmt command will add an equivalent //go:build constraint when encountering the older syntax.

https://pkg.go.dev/cmd/go#hdr-Build_constraints

  1. no_cri constraint was not respected.

Signed-off-by: Maksym Pavlenko [email protected]

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@samuelkarp
Copy link
Copy Markdown
Member

Rebase is needed.

mxpv added 2 commits December 8, 2022 09:36
Signed-off-by: Maksym Pavlenko <[email protected]>
Signed-off-by: Maksym Pavlenko <[email protected]>
@mxpv
Copy link
Copy Markdown
Member Author

mxpv commented Dec 8, 2022

Rebase is needed.

Done

@mxpv mxpv merged commit 34513f9 into containerd:main Dec 8, 2022
@mxpv mxpv deleted the build branch December 8, 2022 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants