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

Conan recipe Update + Conan package upload #1443

Merged
merged 1 commit into from
Nov 19, 2018

Conversation

uilianries
Copy link
Contributor

@uilianries uilianries commented Nov 16, 2018

Description

1 year after #943 🎂 I updated that PR creating a new one.

This PR includes:

  • Updated Conan recipe:
    • Removed version from recipe. It will be retrieved from tag name (branch)
    • Add topics to be used on search engine
    • Updated license name to SPDX format
  • Moved test package dir to .conan
    • As test_package can be customized I moved to keep root path as clean as possible.
    • Using factorial example to check Conan package
    • Validate license copy
  • Build Conan package on Travis CI
    • Add job number 8 using linux + python 3.7
    • Build Conan package for every push
    • Upload Conan package ONLY when matching tag name format

What should be done to upload Conan packages after this PR?

The python package Conan Package Tools (CPT) is a helper to build and upload Conan package when some conditions are valid, this includes:

  • create a Bintray account. Already done by Phil: https://bintray.com/philsquared/Catch2
  • set CONAN_PASSWORD on Travis CI settings (do not forget to set as secret). The password is the Bintray API Key, it can be collect on https://bintray.com/profile/edit, clicking on "API Key".
  • set CONAN_USERNAME to be used on Conan package. By default is configured to catchorg, same organization name. The result will be Catch2/<version>@catchorg/stable
  • set CONAN_LOGIN_USERNAME to be used on Bintray login. By default is philsquared.
  • set CONAN_UPLOAD to configure remote address where the package might be uploaded. By default is https://bintray.com/philsquared/Catch2

Thus the only requirement is CONAN_PASSWORD in Travis settings. All other variables are configured as needed.

GitHub Issues

closes #926
closes #943

Adding some Conan experts to review:
/cc @memsharded @danimtb @Croydon @SSE4

Regards!

@codecov
Copy link

codecov bot commented Nov 16, 2018

Codecov Report

Merging #1443 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1443      +/-   ##
==========================================
- Coverage   80.31%   80.28%   -0.02%     
==========================================
  Files         121      120       -1     
  Lines        3407     3403       -4     
==========================================
- Hits         2736     2732       -4     
  Misses        671      671

@horenmar
Copy link
Member

So, if I understand it correctly, every push to master will build and upload a package, but it will be in "Testing" channel?

@uilianries
Copy link
Contributor Author

no, every push on master will build to check the package consistence, but only tags will be uploaded.

@horenmar
Copy link
Member

I am going to squash this and merge it into master, unless someone objects.

@uilianries
Copy link
Contributor Author

maybe wait for one more review from Conan team. They are at meetingc++ but they will be available on Monday.

@SSE4
Copy link

SSE4 commented Nov 19, 2018

@horenmar I think now it's safe to merge, as conan developer has reviewed and approved it (@danimtb)

@uilianries
Copy link
Contributor Author

I agree!

- Apply new conventions introduced on Conan 1.8
- Removed outdated settings
- Update license to follow SPDX format

Closes catchorg#926
Closes catchorg#943
@horenmar horenmar merged commit 62460fa into catchorg:master Nov 19, 2018
@horenmar
Copy link
Member

Ok, thanks everyone.

@uilianries uilianries deleted the feature/conanio branch November 19, 2018 15:53
@uilianries
Copy link
Contributor Author

Let's wait for the next release to have Catch2 on Bintray!

Please, don't forget to configure your Conan password (Bintray API Key) on Travis settings.

Regards!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Conan recipe for Catch project
4 participants