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

PR for #2006 to test in AppVeyor. #2008

Merged
merged 1 commit into from
Apr 5, 2020

Conversation

garethsb
Copy link
Contributor

PR for #2006 to test in AppVeyor as requested by @t-b.


Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

@garethsb garethsb requested a review from nlohmann as a code owner March 24, 2020 12:58
@garethsb
Copy link
Contributor Author

Sure enough, the AppVeyor Visual Studio 2015 build and test job passed. Either the tests are not sufficient to demonstrate the original problem, or it has been independently fixed by other changes (or a VS 2015 update?).

@t-b
Copy link
Contributor

t-b commented Mar 25, 2020

Looking at https://ci.appveyor.com/project/nlohmann/json/builds/31680408/job/s1dryqoqfjcehkln gives Microsoft (R) Build Engine version 16.5.0+d4cbfca49 for .NET Framework which shows that this indeed fixes the issue.

So I think this is ready to go.

@dota17
Copy link
Contributor

dota17 commented Mar 26, 2020

I had checked and tested in my fork repo.
After merging this PR, the Appveyor CI will pass.

@emmenlau
Copy link

emmenlau commented Apr 2, 2020

I can confirm that this fixes the issue for us, so we can build 3.7.3 after applying this PR with VS2019 release 5.2. Thanks!

@emmenlau
Copy link

emmenlau commented Apr 2, 2020

Dear admins, I think the Travis build report is incorrect. In the details I see all jobs as completed and one failed. However this page still lists Travis as "pending".
Is there something that needs to be done?

Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann self-assigned this Apr 5, 2020
@nlohmann nlohmann added this to the Release 3.7.4 milestone Apr 5, 2020
@nlohmann nlohmann merged commit 83e36f3 into nlohmann:develop Apr 5, 2020
@nlohmann
Copy link
Owner

nlohmann commented Apr 5, 2020

Thanks!

@nlohmann
Copy link
Owner

nlohmann commented Apr 5, 2020


🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

  • ✨ New Feature
  • 🐛 Bug Fix
  • ⚡️ Improvement
  • 🔨 Further Change
  • 🔥 Deprecated function

Description


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.

5 participants