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

Cut 0.28.1 #5757

Merged
merged 3 commits into from
Oct 6, 2022
Merged

Cut 0.28.1 #5757

merged 3 commits into from
Oct 6, 2022

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Oct 4, 2022

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

It is a little bit late now but the goal of this pr is to cut v0.28.1-rc.0 to mainly brings in https://github.com/thanos-io/thanos/pull/5702/files to fix panic due to minio.

Verification

@yeya24
Copy link
Contributor Author

yeya24 commented Oct 4, 2022

Umm, I am not sure how should I fix the DCO issue.

Commit sha: [5b5cdc9](https://github.com/thanos-io/thanos/pull/5757/commits/5b5cdc9cab9c8dfaaa1e2b1b6e0a214f6a93eaf0), Author: Sotiris Nanopoulos, Committer: Ben Ye; Can not find "Sotiris Nanopoulos [sonanopo@microsoft.com](mailto:sonanopo@microsoft.com)", in ["Sotiris Nanopoulos [sotiris.nanopoulos@reddit.com](mailto:sotiris.nanopoulos@reddit.com)", "Sotiris Nanopoulos [sotiris.nanopoulos@reddit.com](mailto:sotiris.nanopoulos@reddit.com)", "Sotiris Nanopoulos [sotiris.nanopoulos@reddit.com](mailto:sotiris.nanopoulos@reddit.com)"].

Should I signed off forsonanopo@microsoft.com?

@squat
Copy link
Member

squat commented Oct 4, 2022

Can't we just force it to pass?

@SuperQ
Copy link
Contributor

SuperQ commented Oct 5, 2022

This change is small enough, I don't really see a need to cut a release candidate. Maybe just directly release 0.28.1.

@davinci26
Copy link
Contributor

Hmmm seems like there is a residual email from my previous company that is messing things up. Added the reddit email to DCO maybe this will fix things?

@matej-g
Copy link
Collaborator

matej-g commented Oct 5, 2022

Unfortunately we seem to have issues with DCO all the time, even though all the commits are properly signed, not the first time during release. We should be fine skipping it IMHO if we manually verify the commits are signed.

Otherwise agreed with @SuperQ, this might be fine without RC given it's a single small fix.

@yeya24
Copy link
Contributor Author

yeya24 commented Oct 5, 2022

Cool, I will skip the RC and cut the release.

@douglascamata
Copy link
Contributor

The DCO failure is because the commit has to be signed by the commiter. 5b5cdc9 was signed by @davinci26, but commited by @yeya24, so it needs to be signed also by @yeya24.

@squat
Copy link
Member

squat commented Oct 6, 2022

Ah makes sense, because it's not the same as the original commit that was merged into main

Sotiris Nanopoulos and others added 2 commits October 6, 2022 09:25
* Updates minio-go to v7.0.37 from v7.0.32

fixes #5701

Changelog: minio/minio-go@v7.0.32...v7.0.37

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>

* Adds changelog entry

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Ben Ye <benye@amazon.com>

add line

Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24
Copy link
Contributor Author

yeya24 commented Oct 6, 2022

Thanks @douglascamata, this works!
Anyone would like to take a look? If it is good I will merge.

@SuperQ
Copy link
Contributor

SuperQ commented Oct 6, 2022

Still says -rc.0.

Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24
Copy link
Contributor Author

yeya24 commented Oct 6, 2022

@SuperQ Thanks, mind taking another look?

Copy link
Contributor

@SuperQ SuperQ left a comment

Choose a reason for hiding this comment

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

LGTM

@yeya24 yeya24 changed the title Cut 0.28.1-rc.0 Cut 0.28.1 Oct 6, 2022
@yeya24 yeya24 merged commit 41a8ce6 into release-0.28 Oct 6, 2022
squat pushed a commit that referenced this pull request Oct 7, 2022
* Cut 0.28.0-rc.0 (#5632)

* cut 0.28.0-rc.0

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* address review comments

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* mention experimental/hidden features

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* include #5607 in changelog

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* cut v0.28.0 (#5647)

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* Cut 0.28.1 (#5757)

* Updates minio-go to v7.0.37 from v7.0.32 (#5702)

* Updates minio-go to v7.0.37 from v7.0.32

fixes #5701

Changelog: minio/minio-go@v7.0.32...v7.0.37

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>

* Adds changelog entry

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog and version

Signed-off-by: Ben Ye <benye@amazon.com>

add line

Signed-off-by: Ben Ye <benye@amazon.com>

* update version to 0.28.1

Signed-off-by: Ben Ye <benye@amazon.com>

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Sotiris Nanopoulos <sonanopo@microsoft.com>

Signed-off-by: Ben Ye <ben.ye@bytedance.com>
Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Ben Ye <ben.ye@bytedance.com>
Co-authored-by: Sotiris Nanopoulos <sonanopo@microsoft.com>
utukJ pushed a commit to utukJ/thanos that referenced this pull request Oct 13, 2022
* Cut 0.28.0-rc.0 (thanos-io#5632)

* cut 0.28.0-rc.0

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* address review comments

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* mention experimental/hidden features

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* include thanos-io#5607 in changelog

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* cut v0.28.0 (thanos-io#5647)

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

Signed-off-by: Ben Ye <ben.ye@bytedance.com>

* Cut 0.28.1 (thanos-io#5757)

* Updates minio-go to v7.0.37 from v7.0.32 (thanos-io#5702)

* Updates minio-go to v7.0.37 from v7.0.32

fixes thanos-io#5701

Changelog: minio/minio-go@v7.0.32...v7.0.37

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>

* Adds changelog entry

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>

* update changelog and version

Signed-off-by: Ben Ye <benye@amazon.com>

add line

Signed-off-by: Ben Ye <benye@amazon.com>

* update version to 0.28.1

Signed-off-by: Ben Ye <benye@amazon.com>

Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Sotiris Nanopoulos <sonanopo@microsoft.com>

Signed-off-by: Ben Ye <ben.ye@bytedance.com>
Signed-off-by: Sotiris Nanopoulos <sotiris.nanopoulos@reddit.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Ben Ye <ben.ye@bytedance.com>
Co-authored-by: Sotiris Nanopoulos <sonanopo@microsoft.com>
Signed-off-by: utukj <utukphd@gmail.com>
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.

6 participants