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

Update report run status more consistently (bp #1434) #1448

Merged
merged 3 commits into from
Mar 17, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 16, 2021

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

Cherry-pick of dd7eca8 has failed:

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

You are currently cherry-picking commit dd7eca86d.
  (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:   src/manage.c

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

Cherry-pick of dc54e17 has failed:

On branch mergify/bp/master/pr-1434
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dc54e17f4.
  (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:   CHANGELOG.md

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/

To ensure the task status changes in fork_osp_scan_handler,
stop_osp_task and stop_task_internal also update the report status
before events are triggered, they will set current_scanner_task and
global_current_report temporarily / within the forked process.

(cherry picked from commit dd7eca8)

# Conflicts:
#	src/manage.c
(cherry picked from commit dc54e17)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team March 16, 2021 09:31
@mergify mergify bot added the conflicts This backport pull request has merge conflicts that need to be resolved label Mar 16, 2021
The conflicts were a changelog entry and a case in stop_task_internal
used only for the now removed GMP scanners.
@timopollmeier timopollmeier added conflicts-resolved This backport pull request had merge conflicts that have been resolved and removed conflicts This backport pull request has merge conflicts that need to be resolved labels Mar 16, 2021
@nichtsfrei nichtsfrei merged commit 7e5d7af into master Mar 17, 2021
@nichtsfrei nichtsfrei deleted the mergify/bp/master/pr-1434 branch March 17, 2021 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts-resolved This backport pull request had merge conflicts that have been resolved
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants