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

Print the rust version when building bpf programs (bp #16181) #16182

Merged
merged 1 commit into from
Mar 29, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 29, 2021

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

Cherry-pick of abada56 has failed:

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

You are currently cherry-picking commit abada56ba.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/bpf/scripts/install.sh

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it 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/

(cherry picked from commit abada56)

# Conflicts:
#	sdk/bpf/scripts/install.sh
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Mar 29, 2021
@jstarry jstarry merged commit cc7342a into v1.5 Mar 29, 2021
@jstarry jstarry deleted the mergify/bp/v1.5/pr-16181 branch March 29, 2021 12:00
CriesofCarrots pushed a commit to CriesofCarrots/solana that referenced this pull request Mar 29, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant