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

Add step for merging release branch back to main. #4770

Merged
merged 3 commits into from
Nov 6, 2021

Conversation

pstibrany
Copy link
Contributor

This PR updates release procedure to include merging of release branch to main (after each release). This makes the latest version tags reachable from main, which is important for Go modules to not get confused about which version to use when trying to use branch names. This is only important for projects (eg. Cortex) that depend on Thanos.

For example:

$ go get github.com/thanos-io/thanos@main
go get: github.com/thanos-io/thanos@main (v0.19.1-0.20211012092857-7dee6fa15682) requires github.com/thanos-io/[email protected], not github.com/thanos-io/thanos@main (v0.19.1-0.20211012092857-7dee6fa15682)

This happens because latest reachable tag from main branch is v0.19.0 and not v0.23.1.

Signed-off-by: Peter Štibraný <[email protected]>
yeya24
yeya24 previously approved these changes Oct 30, 2021
Copy link
Contributor

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

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

The step looks good! But the format check still fails...

Signed-off-by: Peter Štibraný <[email protected]>
@pstibrany
Copy link
Contributor Author

Thanks for ping, I forgot about this. I've pushed formatted docs. Hopefully it will work.

@pstibrany
Copy link
Contributor Author

Now the failure seems to be unrelated to my change:

error: 		docs/getting-started.md:102: "https://build.thebeat.co/monitoring-the-beat-microservices-a-tale-of-evolution-4e246882606e" not accessible even after retry; status code 0: Get "https://build.thebeat.co/monitoring-the-beat-microservices-a-tale-of-evolution-4e246882606e": net/http: request canceled (Client.Timeout exceeded while awaiting headers)

@yeya24 yeya24 enabled auto-merge (squash) November 6, 2021 18:47
@yeya24 yeya24 merged commit 14c891c into thanos-io:main Nov 6, 2021
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.

2 participants