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

Add new handler for single performance report (backport #3149) #3156

Merged
merged 8 commits into from
Sep 23, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 16, 2021

This is an automatic backport of pull request #3149 done by Mergify.
Cherry-pick of f4fab55 has failed:

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

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

Cherry-pick of cb0403f has failed:

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

You are currently cherry-picking commit cb0403ff4.
  (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 fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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/

jhelmold and others added 4 commits September 16, 2021 09:21
Add new handler "get_system_report_gmp()" for single performance
reports. Rename old handler to get_system_report_gmp_from_url().

(cherry picked from commit a6b9c3f)
Adjusted the source code formatting for "gsad_gmp.c",
"gsad_gmp.h" and "gsad_http_handler.c".

(cherry picked from commit b8f3832)
(cherry picked from commit f4fab55)

# Conflicts:
#	CHANGELOG.md
(cherry picked from commit cb0403f)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner September 16, 2021 09:21
@mergify mergify bot added the conflicts label Sep 16, 2021
@codecov
Copy link

codecov bot commented Sep 23, 2021

Codecov Report

Merging #3156 (0684517) into master (f128c37) will not change coverage.
The diff coverage is n/a.

❗ Current head 0684517 differs from pull request most recent head 847e189. Consider uploading reports for the commit 847e189 to get more accurate results
Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3156   +/-   ##
=======================================
  Coverage   58.81%   58.81%           
=======================================
  Files        1042     1042           
  Lines       25178    25178           
  Branches     7172     7172           
=======================================
  Hits        14809    14809           
  Misses       9400     9400           
  Partials      969      969           
Impacted Files Coverage Δ
...rc/web/pages/scanconfigs/editconfigfamilydialog.js 90.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fc8dfeb...847e189. Read the comment docs.

@bjoernricks bjoernricks merged commit 5e1791c into master Sep 23, 2021
@bjoernricks bjoernricks deleted the mergify/bp/master/pr-3149 branch September 23, 2021 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants