Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 8, 2021

This is an automatic backport of pull request #17632 done by Mergify.
Cherry-pick of 8a9b7f5 has failed:

On branch mergify/bp/v1.7/pr-17632
Your branch is up to date with 'origin/v1.7'.

You are currently cherry-picking commit 8a9b7f5ef.
  (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:   Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ledger/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

asubiotto added 2 commits June 8, 2021 19:10
This feature requires clang to support -march=native on M1. Before this change,
cargo build would output a build error when building for aarch64.

(cherry picked from commit 8a9b7f5)

# Conflicts:
#	ledger/Cargo.toml
This change adds a target arch check so that cargo build can be run from an
Apple M1 mac.

(cherry picked from commit 7ee5b02)
@mergify mergify bot added the conflicts label Jun 8, 2021
@mvines
Copy link
Contributor

mvines commented Jun 8, 2021

Blocked if/until we backport #17722 to v1.7

@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 8, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jun 8, 2021

automerge label removed due to a CI failure

@stale
Copy link

stale bot commented Jun 16, 2021

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs.

@stale stale bot added the stale [bot only] Added to stale content; results in auto-close after a week. label Jun 16, 2021
@stale
Copy link

stale bot commented Jun 26, 2021

This stale pull request has been automatically closed. Thank you for your contributions.

@stale stale bot closed this Jun 26, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-17632 branch June 26, 2021 12:26
@mschneider
Copy link
Contributor

@mvines i believe this should be re-opened bpf 1.9 was backported to 1.7 #18766

@mvines mvines restored the mergify/bp/v1.7/pr-17632 branch July 24, 2021 23:07
@mvines
Copy link
Contributor

mvines commented Jul 24, 2021

@mvines i believe this should be re-opened bpf 1.9 was backported to 1.7 #18766

Thanks! I've created #18883 since I couldn't re-open this PR for some reason

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

conflicts stale [bot only] Added to stale content; results in auto-close after a week.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants