Skip to content

[1.23](backport #582) Revert "Remove building ppc (#504) (#513)"#584

Merged
v1v merged 3 commits into
1.23from
mergify/bp/1.23/pr-582
Apr 7, 2025
Merged

[1.23](backport #582) Revert "Remove building ppc (#504) (#513)"#584
v1v merged 3 commits into
1.23from
mergify/bp/1.23/pr-582

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Apr 7, 2025

This reverts #504 and #513

Closes #580


This is an automatic backport of pull request #582 done by Mergify.

(cherry picked from commit d40b4f7)

# Conflicts:
#	go/Makefile.debian12
@mergify mergify Bot requested a review from a team as a code owner April 7, 2025 11:14
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Apr 7, 2025
@mergify mergify Bot requested review from andrzej-stencel and kaanyalti April 7, 2025 11:14
@mergify mergify Bot assigned v1v Apr 7, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Apr 7, 2025

Cherry-pick of d40b4f7 has failed:

On branch mergify/bp/1.23/pr-582
Your branch is up to date with 'origin/1.23'.

You are currently cherry-picking commit d40b4f7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/release-drafter.yml
	modified:   README.md
	new file:   go/ppc/.dockerignore
	new file:   go/ppc/Dockerfile.tmpl
	new file:   go/ppc/Makefile
	new file:   go/ppc/rootfs/compilers.yaml
	new file:   go/ppc/rootfs/helloWorld.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go/Makefile.debian12

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Comment thread go/Makefile.debian12 Outdated
Comment thread go/Makefile.debian12 Outdated
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Apr 7, 2025
@elasticmachine
Copy link
Copy Markdown

💚 Build Succeeded

History

cc @v1v

@elasticmachine
Copy link
Copy Markdown

💚 Build Succeeded

History

cc @v1v

@elasticmachine
Copy link
Copy Markdown

💚 Build Succeeded

History

cc @v1v

@v1v v1v merged commit 34f40ab into 1.23 Apr 7, 2025
@v1v v1v deleted the mergify/bp/1.23/pr-582 branch April 7, 2025 13:08
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.

2 participants