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.

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

[v24.1.x ] Manual backports: Mac build fix & go deps bump #25182

Merged
merged 3 commits into from
Feb 25, 2025
Merged

[v24.1.x ] Manual backports: Mac build fix & go deps bump #25182

merged 3 commits into from
Feb 25, 2025

Conversation

r-vasquez
Copy link
Contributor

This is a backport of multiple fixes:

Backports Required

  • none - not a bug fix
  • none - this is a backport
  • none - issue does not exist in previous branches
  • none - papercut/not impactful enough to backport
  • v24.3.x
  • v24.2.x
  • v24.1.x

Release Notes

  • none

rockwotj and others added 3 commits February 25, 2025 12:08
@rockwotj @r-vasquez
rpk: fix confusing-results lint
e633755 
(cherry picked from commit 0d6b4a4)
@r-vasquez
rpk: only include tuner package files in linux
6efc8b4 
These files are only used in our tuner package, which only works for
linux.

Our other build targets (windows/darwin) should not care about these
files.

This also fixes an issue that prevented Mac users from running the
linter.

(cherry picked from commit 23333be)
@r-vasquez
rpk/chore: bump go dependencies
0002162
@r-vasquez r-vasquez requested a review from andrewhsu February 25, 2025 20:18
andrewhsu
andrewhsu approved these changes Feb 25, 2025
View reviewed changes
Copy link
Member

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

the macos-15 tests are green, so adjustments to the backports to get darwin working lgtm, but i'm not as familiar with the codebase to verify all of the conflict resolutions.

@r-vasquez r-vasquez merged commit e7b76b0 into redpanda-data:v24.1.x Feb 25, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

@twmb twmb Awaiting requested review from twmb twmb is a code owner

@gene-redpanda gene-redpanda Awaiting requested review from gene-redpanda gene-redpanda is a code owner

Assignees
No one assigned
Labels
area/rpk
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@r-vasquez @andrewhsu @rockwotj