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

Unignore advisories as affected ver. is corrected (bp #7730) #7782

Merged
merged 2 commits into from
Jan 14, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2020

This is an automated backport of pull request #7730 done by Mergify.io

Cherry-pick of 699ca5f has failed:

On branch mergify/bp/v0.21/pr-7730
Your branch is up to date with 'origin/v0.21'.

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   ci/test-checks.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 [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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 simulator.

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

For details see upstream PR: rustsec/advisory-db#221

(cherry picked from commit 699ca5f)

# Conflicts:
#	ci/test-checks.sh
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 14, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 14, 2020
@codecov
Copy link

codecov bot commented Jan 14, 2020

Codecov Report

Merging #7782 into v0.21 will increase coverage by 24.2%.
The diff coverage is n/a.

@@           Coverage Diff            @@
##           v0.21   #7782      +/-   ##
========================================
+ Coverage   57.7%   81.9%   +24.2%     
========================================
  Files        239     241       +2     
  Lines      64226   51070   -13156     
========================================
+ Hits       37076   41841    +4765     
+ Misses     27150    9229   -17921

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 14, 2020
@solana-grimes solana-grimes merged commit 2d3ead0 into v0.21 Jan 14, 2020
@mergify mergify bot deleted the mergify/bp/v0.21/pr-7730 branch January 14, 2020 03:56
This was referenced May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants