Skip to content

Merge release-1.18 back to master #6273

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Oct 17, 2024
Merged

Merge release-1.18 back to master #6273

merged 1 commit into from
Oct 17, 2024

Conversation

friedrichg
Copy link
Member

@friedrichg friedrichg commented Oct 16, 2024 •
edited
Loading

What this PR does:

  • Update VERSION file
  • Update changelog

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@friedrichg
Backport go upgrade to patch CVEs (#6264)
6a5c013 
* Backport go upgrade to patch CVEs

Signed-off-by: Friedrich Gonzalez <[email protected]>

* Update VERSION file

Signed-off-by: Friedrich Gonzalez <[email protected]>

---------

Signed-off-by: Friedrich Gonzalez <[email protected]>
@dosubot dosubot bot added the type/chore Something that needs to be done; not a bug or a feature label Oct 16, 2024
@CharlieTLe
Copy link
Member

Seems to be missing changes for:

  • .github/workflows/test-build-deploy.yml
  • Makefile

https://github.com/cortexproject/cortex/pull/6264/files

@friedrichg
Copy link
Member Author

@CharlieTLe The backport was from 1.22.5 to 1.22.7
go in master has a newer version already (1.23) #6262
we can't override that

yeya24
yeya24 approved these changes Oct 17, 2024
View reviewed changes
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.

Thanks

@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Oct 17, 2024
@friedrichg friedrichg merged commit 441ed1d into master Oct 17, 2024
16 checks passed
@friedrichg friedrichg deleted the merge-release-1.18-to-master branch October 17, 2024 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yeya24 yeya24 yeya24 approved these changes

@CharlieTLe CharlieTLe Awaiting requested review from CharlieTLe

Assignees

No one assigned

Labels

lgtm This PR has been approved by a maintainer size/XS type/chore Something that needs to be done; not a bug or a feature

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@friedrichg @CharlieTLe @yeya24