Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

release: Post 0.12.0 release reverts #489

Conversation

stevenhorsman
Copy link
Member

release: Post-release reverts

This reverts the hard-coding of payload versions
for the 0.12 release done in #487

This reverts commit 34e589a.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This reverts commit 7636a9a.

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
Copy link
Member

@fitzthum fitzthum left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks

Copy link
Contributor

@ldoktor ldoktor left a comment

Choose a reason for hiding this comment

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

LGTM although it took me a while to find out why the revert commits contain a different hash than the ones in #487 . @fitzthum is there a specific reason not to use merge commit to merge PRs or is it just personal matter of taste?

@fitzthum
Copy link
Member

or is it just personal matter of taste?

Yes. I don't really like merge commits in the history and it can have confusing behavior in some cases. For instance during the release process we check that the latest changes to the pre-reqs dir match the pre-reqs image that we are pulling, but the image ends up being built from the merge commit which you won't see if you go to the directory. I don't really care that much tho tbh.

@stevenhorsman stevenhorsman merged commit 4b6b25f into confidential-containers:main Jan 30, 2025
19 checks passed
@stevenhorsman stevenhorsman deleted the post-0.12.0-release-reverts branch January 30, 2025 10:18
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants