Skip to content

Move CRI release logic to Makefile#4580

Merged
mxpv merged 2 commits intocontainerd:masterfrom
dmcgowan:move-release-build-makefile
Sep 23, 2020
Merged

Move CRI release logic to Makefile#4580
mxpv merged 2 commits intocontainerd:masterfrom
dmcgowan:move-release-build-makefile

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Allows building the cri-release package outside of the github action. This is also much simpler than the cri-release which was recently removed as it uses the locally built binaries and scripts which are now in containerd/containerd.

Verified Github release changes at https://github.com/dmcgowan/containerd/runs/1153643111

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 23, 2020

Build succeeded.

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

@dmcgowan dmcgowan force-pushed the move-release-build-makefile branch from eef2262 to afcc448 Compare September 23, 2020 15:58
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 23, 2020

Build succeeded.

Copy link
Copy Markdown
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread .github/workflows/release.yml Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

any reason to leave just seccomp here?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

seccomp is an environment dependency for build rather than a package which gets built along with the release. It doesn't make sense to have the makefile install this since it may already be installed in the environment in some other way.

Comment thread Makefile Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

$(ROOTDIR) has a / at the end?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

it does, updated to use join to create the output dir

Comment thread Makefile Outdated
Copy link
Copy Markdown
Member

@dims dims Sep 23, 2020

Choose a reason for hiding this comment

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

$(ROOTDIR)_output ? similar to line 125

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Updated here and uses sudo when it exists to remove since it gets created with sudo.

@dmcgowan dmcgowan force-pushed the move-release-build-makefile branch from afcc448 to 241be70 Compare September 23, 2020 21:10
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Sep 23, 2020

Build succeeded.

@dims
Copy link
Copy Markdown
Member

dims commented Sep 23, 2020

LGTM

thanks @dmcgowan

Copy link
Copy Markdown
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

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

LGTM

@mxpv mxpv merged commit efc67b1 into containerd:master Sep 23, 2020
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@dmcgowan dmcgowan deleted the move-release-build-makefile branch March 23, 2022 22:26
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.

6 participants