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

Bump bundled nlohmann::json to commit 84f19d6 #209

Merged
merged 2 commits into from
May 19, 2020

Conversation

paulgessinger
Copy link
Member

There is a gcc10 compilation issue that got resolved in
#2034. There has not been
a tag since this was merged so I'm bumping the bundled version to the
develop branch immediately after that PR went in.

There is a gcc10 compilation issue that got resolved in
[acts-project#2034](nlohmann/json#2034). There has not been
a tag since this was merged so I'm bumping the bundled version to the
develop branch immediately after that PR went in.
@paulgessinger paulgessinger added the Bug Something isn't working label May 19, 2020
@acts-issue-bot acts-issue-bot bot removed the Triage label May 19, 2020
@paulgessinger paulgessinger added this to the v0.25.00 milestone May 19, 2020
@msmk0 msmk0 added the Impact - Minor Nuissance bug and/or affects only a single module label May 19, 2020
Copy link
Contributor

@asalzburger asalzburger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uncontroversial

@codecov
Copy link

codecov bot commented May 19, 2020

Codecov Report

Merging #209 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #209   +/-   ##
=======================================
  Coverage   44.88%   44.88%           
=======================================
  Files         369      369           
  Lines       18451    18451           
  Branches     8737     8737           
=======================================
  Hits         8281     8281           
  Misses       4861     4861           
  Partials     5309     5309           

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 877b811...77fe961. Read the comment docs.

@msmk0
Copy link
Contributor

msmk0 commented May 19, 2020

@paulgessinger Could you rebase?

@paulgessinger
Copy link
Member Author

I can but it should b safe to do a squash and merge in this case.

@msmk0
Copy link
Contributor

msmk0 commented May 19, 2020

Yes, true.

@asalzburger asalzburger merged commit fd95c91 into acts-project:master May 19, 2020
paulgessinger added a commit to paulgessinger/acts that referenced this pull request Jul 13, 2020
There is a gcc10 compilation issue that got resolved in
[acts-project#2034](nlohmann/json#2034). There has not been
a tag since this was merged so I'm bumping the bundled version to the
develop branch immediately after that PR went in.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working Impact - Minor Nuissance bug and/or affects only a single module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants