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

#3649 Update CI templates #3651

Merged
merged 7 commits into from Oct 26, 2018

Conversation

Projects
None yet
4 participants
@uilianries
Copy link
Member

commented Oct 1, 2018

Hi this PR brings some updates related to issue #3649 :

  • CONAN_REFERENCE is no longer required
  • Add GCC 8 on default CI template list
  • Add Clang 5, 6 on default CI template list
  • Update unit test to avoid CONAN_REFERENCE

closes #3649

Changelog: Fix: Updated templates of the conan new command with the latest conan package tools changes.

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.
#3649 Update CI templates
- CONAN_REFERENCE is no longer required
- Add GCC 8 on default CI template list
- Add Clang 5, 6 on default CI template list
- Update unit test to avoid CONAN_REFERENCE

Signed-off-by: Uilian Ries <uilianries@gmail.com>

@ghost ghost added the contributor pr label Oct 1, 2018

@danimtb

danimtb approved these changes Oct 1, 2018

Copy link
Member

left a comment

CI failed due to Mac slaves not working

@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 1, 2018

My changes didn't affect Macos jobs 🤔

infrastructure error?

@danimtb

This comment has been minimized.

Copy link
Member

commented Oct 1, 2018

yes, that is what I meant

#3649 Update Conan Package Tools template
- User new CPT import

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Show resolved Hide resolved conans/client/cmd/new_ci.py Outdated

@lasote lasote added this to the 1.9 milestone Oct 8, 2018

#3649 Revert Conan reference in new CI
- Conan reference is mandatory when the recipe does not contain
  name and version.

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@lasote

This comment has been minimized.

Copy link
Contributor

commented Oct 9, 2018

Should we add clang 7?

@Croydon

This comment has been minimized.

Copy link
Contributor

commented Oct 9, 2018

We should first solve the discussion around the new Clang 7 version schema I guess.

@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 9, 2018

Did you mean #3643 ?

@Croydon

This comment has been minimized.

Copy link
Contributor

commented Oct 9, 2018

Did you mean #3643 ?

Yes

@danimtb
Copy link
Member

left a comment

Please update Appveyor CI template to use Python 3 instead of python 2

@Croydon

This comment has been minimized.

Copy link
Contributor

commented Oct 19, 2018

I can't see any change related to

CONAN_REFERENCE is no longer required

🤔

@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 19, 2018

I can't see any change related to

CONAN_REFERENCE is no longer required

thinking

I removed at first moment, but I reverted after Lasote request:

806fce7

#3649 Update appveyor template to run python3
- Replace Python27 by Python37. Both Python arch and version are no
longer required.
- Update Travis using Xenial as base image

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 19, 2018

@danimtb

Please update Appveyor CI template to use Python 3 instead of python 2

Done!

@Croydon

This comment has been minimized.

Copy link
Contributor

commented Oct 19, 2018

Could you also please update the container names to conanio/<compiler><compiler-version>? It seems still to use the old names

@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 19, 2018

Could you also please update the container names to conanio/<compiler><compiler-version>? It seems still to use the old names

sure! thanks for reviewing.

#3649 Update docker image names
Signed-off-by: Uilian Ries <uilianries@gmail.com>
@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 19, 2018

@Croydon Done!

@Croydon
Copy link
Contributor

left a comment

LGTM

@uilianries

This comment has been minimized.

Copy link
Member Author

commented Oct 19, 2018

I forgot to update the tests 🤦‍♂

#3649 Update unit test for new CI
Signed-off-by: Uilian Ries <uilianries@gmail.com>

@lasote lasote referenced this pull request Oct 26, 2018

Closed

Update Gitlab CI template #3649

3 of 3 tasks complete
@lasote

lasote approved these changes Oct 26, 2018

@lasote lasote merged commit 6887698 into conan-io:develop Oct 26, 2018

1 of 2 checks passed

continuous-integration/jenkins/pr-head This commit cannot be built
Details
license/cla Contributor License Agreement is signed.
Details

@ghost ghost removed the stage: review label Oct 26, 2018

grisumbras pushed a commit to grisumbras/conan that referenced this pull request Dec 27, 2018

conan-io#3649 Update CI templates (conan-io#3651)
* conan-io#3649 Update CI templates

- CONAN_REFERENCE is no longer required
- Add GCC 8 on default CI template list
- Add Clang 5, 6 on default CI template list
- Update unit test to avoid CONAN_REFERENCE

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update Conan Package Tools template

- User new CPT import

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Revert Conan reference in new CI

- Conan reference is mandatory when the recipe does not contain
  name and version.

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update appveyor template to run python3

- Replace Python27 by Python37. Both Python arch and version are no
longer required.
- Update Travis using Xenial as base image

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update docker image names

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* conan-io#3649 Update unit test for new CI

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.