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.

Sign up for GitHub

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 approvaltests.cpp 10.12.0 #7213

Merged
merged 8 commits into from
Sep 15, 2021
Merged

Add approvaltests.cpp 10.12.0 #7213

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14e6e99
Add approvaltests.cpp 10.12.0
isidore Sep 8, 2021
430a609
e disable build on armv8 as requested
isidore Sep 10, 2021
bef9533
Add "arch" to settings in test_package dir
claremacrae Sep 10, 2021
947378b
Make error message more specific
claremacrae Sep 12, 2021
0a90221
Update Catch2 version, to fix building on armv8
claremacrae Sep 12, 2021
767dae8
Remove arch from settings in test_package - no longer needed...
claremacrae Sep 12, 2021
0622ec0
Update doctest version, to fix building on armv8
claremacrae Sep 12, 2021
879ea58
Stop updating many old ApprovalTests.cpp versions in conan-center-index
claremacrae Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions recipes/approvaltests.cpp/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,8 @@ sources:
sha256: 7f4efb835d59b2f31c3dc8a6f35335ad621da538ccb09abf2037d29d4f13f0b2
- url: "https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.11.0/LICENSE"
sha256: c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4
10.12.0:
- url: https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.0/ApprovalTests.v.10.12.0.hpp
sha256: 5084ad71b8cc73ea9d753685b652d8828842335a59ab93a2199ceac879a4b292
- url: "https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.0/LICENSE"
sha256: c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4
4 changes: 2 additions & 2 deletions recipes/approvaltests.cpp/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ def requirements(self):
if self.options.get_safe("with_boosttest"):
self.requires("boost/1.72.0")
if self.options.with_catch2:
self.requires("catch2/2.11.0")
self.requires("catch2/2.13.7")
if self.options.with_gtest:
self.requires("gtest/1.10.0")
if self.options.with_doctest:
self.requires("doctest/2.3.6")
self.requires("doctest/2.4.6")
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
self.requires("doctest/2.4.6")
self.requires("doctest/2.4.6" if tools.Version(self.version) >= "8.2.0" else "doctest/2.3.6")

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you very much. I thought about a condition like that, but was assuming that the older versions would still fail the CI for armv8 (or whatever the problem platform was).

Do you mean to drop support for older versions of ApprovalTests.cpp @prince-chrismc - I didn't know it was possible to do that...

If so, it solves all these CI problems in stroke, without making the recipe more complex, so is a great idea...

if self.options.get_safe("with_cpputest"):
self.requires("cpputest/4.0")

Expand Down
2 changes: 2 additions & 0 deletions recipes/approvaltests.cpp/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ versions:
folder: all
10.11.0:
folder: all
10.12.0:
folder: all