Skip to content

Cherrypick commits for 1.16.1 #5885

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

Merged
merged 4 commits into from
Apr 24, 2024

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Apr 23, 2024

What this PR does:

Cherrypick commits for 1.16.1.

Which issue(s) this PR fixes:
Fixes #5881

Checklist

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

dsabsay and others added 3 commits April 23, 2024 10:52
* Upgrade Alpine to 3.18

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>

* Update CHANGELOG.md

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>

---------

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>
Co-authored-by: Daniel Sabsay <sabsay@adobe.com>
* Upgrade to go 1.21.9

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Update changelog and workflows

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Not use minor version for now. Needs more investigation

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Update image again

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

---------

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
@yeya24
Copy link
Contributor Author

yeya24 commented Apr 23, 2024

Linter failed...
Yeah indeed we upgraded go version to 1.21.9 so we need to fix linter as well here

@friedrichg
Copy link
Member

you need the lint fixes from #5711 here

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

try fixing lint

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

try again

Signed-off-by: Ben Ye <benye@amazon.com>
@yeya24 yeya24 force-pushed the cherrypick-1.16.1 branch from 9767f84 to df4bc66 Compare April 24, 2024 07:39
@yeya24
Copy link
Contributor Author

yeya24 commented Apr 24, 2024

@friedrichg Linter passed... Let's see if it is good to go this time.

@friedrichg friedrichg merged commit 155b2c6 into cortexproject:release-1.16 Apr 24, 2024
@friedrichg
Copy link
Member

I should have not squashed the commits :(

@yeya24 yeya24 deleted the cherrypick-1.16.1 branch April 24, 2024 15:06
yeya24 added a commit that referenced this pull request Apr 25, 2024
* Cherrypick commits for 1.16.1 (#5885)

* Upgrade Alpine to 3.18 (#5684)

* Upgrade Alpine to 3.18

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>

* Update CHANGELOG.md

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>

---------

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>
Co-authored-by: Daniel Sabsay <sabsay@adobe.com>

* Upgrade to go 1.21.9 (#5879)

* Upgrade to go 1.21.9

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Update changelog and workflows

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Not use minor version for now. Needs more investigation

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* Update image again

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

---------

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* fix go version for integration tests (#5882)

Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>

* include #5882 to changelog

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

try fixing lint

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

try again

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

---------

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Daniel Sabsay <danielrsabsay@gmail.com>
Co-authored-by: Daniel Sabsay <sabsay@adobe.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com>

* update changelog

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

---------

Signed-off-by: Daniel Sabsay <sabsay@adobe.com>
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Signed-off-by: Ben Ye <benye@amazon.com>
Co-authored-by: Daniel Sabsay <danielrsabsay@gmail.com>
Co-authored-by: Daniel Sabsay <sabsay@adobe.com>
Co-authored-by: Friedrich Gonzalez <friedrichg@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.

3 participants