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

Drop s390x builds #11

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Conversation

mallardduck
Copy link
Member

Because k8s removed builds for s390x we will too

@mallardduck mallardduck merged commit c60a509 into rancher:main Sep 3, 2024
@mallardduck
Copy link
Member Author

/backport NONE release/v2.0

1 similar comment
@mallardduck
Copy link
Member Author

/backport NONE release/v2.0

Copy link

github-actions bot commented Sep 3, 2024

Not creating port PR, there was an error running git am -3:

Applying: Because k8s removed builds for s390x we will too
Using index info to reconstruct a base tree...
M	hack/make/deps.mk
Falling back to patching base and 3-way merge...
Auto-merging hack/make/deps.mk
CONFLICT (content): Merge conflict in hack/make/deps.mk
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Because k8s removed builds for s390x we will too

mallardduck added a commit that referenced this pull request Sep 3, 2024
Drop s390x builds

(cherry picked from commit c60a509)
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.

1 participant